Correct minor merge conflict (#6017)

dgraph-io · Jul 16, 2020 · 363dd46 · 363dd46
1 parent b300f29
commit 363dd46
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/systest/21million/test-21million.sh b/systest/21million/test-21million.sh
@@ -58,11 +58,7 @@ options:
     --quiet         just report which queries differ, without a diff
     --mode          normal = run dgraph in normal mode
                     none = run dgraph in normal mode
-<<<<<<< HEAD
-		    ludicrous = run dgraph in ludicrous mode
-=======
                     ludicrous = run dgraph in ludicrous mode
->>>>>>> origin/master
 EOF
     exit 0
 fi