sheree peña smariapena

## imgconflicttestrepo.sh
#!/bin/sh

SCRIPTNAME=$(basename $0)
CURRENT_DIR=$(cd $(dirname $0);pwd)

REPO_PATH="$CURRENT_DIR/image-merge-conflict-test-repo"

if [ -d "$REPO_PATH" ]; then
  rm -fr "$REPO_PATH"
fi
	#!/bin/sh

	SCRIPTNAME=$(basename $0)
	CURRENT_DIR=$(cd $(dirname $0);pwd)

	REPO_PATH="$CURRENT_DIR/image-merge-conflict-test-repo"

	if [ -d "$REPO_PATH" ]; then
	rm -fr "$REPO_PATH"
	fi