Removed conflict markers from test file

xN4P4LM · web-flow · commit 34b99614f6d5 · 2023-05-05T15:36:56.000-04:00
diff --git a/test/test-ghe-rsync-feature-checker.sh b/test/test-ghe-rsync-feature-checker.sh
@@ -17,8 +17,6 @@ begin_test "Testing ghe-rsync-feature-checker for known supported command --help
 )
 end_test
 
-<<<<<<< Updated upstream
-=======
 begin_test "Testing ghe-rsync-feature-checker for known supported command -help"
 (
     set -e
@@ -28,7 +26,6 @@ begin_test "Testing ghe-rsync-feature-checker for known supported command -help"
 )
 end_test
 
->>>>>>> Stashed changes
 begin_test "Testing ghe-rsync-feature-checker with known supported command help"
 (
     set -e
@@ -50,8 +47,6 @@ begin_test "Testing ghe-rsync-feature-checker with known unsupported command --n
 )
 end_test
 
-<<<<<<< Updated upstream
-=======
 begin_test "Testing ghe-rsync-feature-checker with known unsupported command -not-an-actual-feature"
 (
     set -e
@@ -62,7 +57,6 @@ begin_test "Testing ghe-rsync-feature-checker with known unsupported command -no
 )
 end_test
 
->>>>>>> Stashed changes
 begin_test "Testing ghe-rsync-feature-checker with known unsupported command not-an-actual-feature"
 (
     set -e
@@ -123,8 +117,6 @@ begin_test "Testing ghe-rsync-feature-checker with known supported command --ver
 )
 end_test
 
-<<<<<<< Updated upstream
-=======
 begin_test "Testing ghe-rsync-feature-checker with known supported command -verbose"
 (
     set -e
@@ -134,7 +126,6 @@ begin_test "Testing ghe-rsync-feature-checker with known supported command -verb
 )
 end_test
 
->>>>>>> Stashed changes
 begin_test "Testing ghe-rsync-feature-checker with known supported command verbose"
 (
     set -e

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ begin_test "Testing ghe-rsync-feature-checker for known supported command --help`
`17`	`17`	`)`
`18`	`18`	`end_test`
`19`	`19`
`20`		`-<<<<<<< Updated upstream`
`21`		`-=======`
`22`	`20`	`begin_test "Testing ghe-rsync-feature-checker for known supported command -help"`
`23`	`21`	`(`
`24`	`22`	`set -e`
`@@ -28,7 +26,6 @@ begin_test "Testing ghe-rsync-feature-checker for known supported command -help"`
`28`	`26`	`)`
`29`	`27`	`end_test`
`30`	`28`
`31`		`->>>>>>> Stashed changes`
`32`	`29`	`begin_test "Testing ghe-rsync-feature-checker with known supported command help"`
`33`	`30`	`(`
`34`	`31`	`set -e`
`@@ -50,8 +47,6 @@ begin_test "Testing ghe-rsync-feature-checker with known unsupported command --n`
`50`	`47`	`)`
`51`	`48`	`end_test`
`52`	`49`
`53`		`-<<<<<<< Updated upstream`
`54`		`-=======`
`55`	`50`	`begin_test "Testing ghe-rsync-feature-checker with known unsupported command -not-an-actual-feature"`
`56`	`51`	`(`
`57`	`52`	`set -e`
`@@ -62,7 +57,6 @@ begin_test "Testing ghe-rsync-feature-checker with known unsupported command -no`
`62`	`57`	`)`
`63`	`58`	`end_test`
`64`	`59`
`65`		`->>>>>>> Stashed changes`
`66`	`60`	`begin_test "Testing ghe-rsync-feature-checker with known unsupported command not-an-actual-feature"`
`67`	`61`	`(`
`68`	`62`	`set -e`
`@@ -123,8 +117,6 @@ begin_test "Testing ghe-rsync-feature-checker with known supported command --ver`
`123`	`117`	`)`
`124`	`118`	`end_test`
`125`	`119`
`126`		`-<<<<<<< Updated upstream`
`127`		`-=======`
`128`	`120`	`begin_test "Testing ghe-rsync-feature-checker with known supported command -verbose"`
`129`	`121`	`(`
`130`	`122`	`set -e`
`@@ -134,7 +126,6 @@ begin_test "Testing ghe-rsync-feature-checker with known supported command -verb`
`134`	`126`	`)`
`135`	`127`	`end_test`
`136`	`128`
`137`		`->>>>>>> Stashed changes`
`138`	`129`	`begin_test "Testing ghe-rsync-feature-checker with known supported command verbose"`
`139`	`130`	`(`
`140`	`131`	`set -e`