summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_view.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index 085b1acf..faf772fd 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -369,7 +369,6 @@ nuke_dir(Dir) ->
% keys come back in the language of btree - tuples.
less_json_ids({JsonA, IdA}, {JsonB, IdB}) ->
-<<<<<<< HEAD
case less_json0(JsonA, JsonB) of
0 ->
IdA < IdB;