Francisco J. Belchi fjbelchi

## solve_pbxproj_merge_conflict.sh
#!/bin/sh

projectfile=`find -d . -name 'project.pbxproj'`
projectdir=`echo *.xcodeproj`
projectfile="${projectdir}/project.pbxproj"
tempfile="${projectdir}/project.pbxproj.out"
savefile="${projectdir}/project.pbxproj.mergesave"

cat $projectfile | grep -v "<<<<<<< HEAD" | grep -v "=======" | grep -v "^>>>>>>> " > $tempfile
cp $projectfile $savefile
	#!/bin/sh

	projectfile=`find -d . -name 'project.pbxproj'`
	projectdir=`echo *.xcodeproj`
	projectfile="${projectdir}/project.pbxproj"
	tempfile="${projectdir}/project.pbxproj.out"
	savefile="${projectdir}/project.pbxproj.mergesave"

	cat $projectfile \| grep -v "<<<<<<< HEAD" \| grep -v "=======" \| grep -v "^>>>>>>> " > $tempfile
	cp $projectfile $savefile