summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-04-25 13:00:54 +0000
committerJan Lehnardt <jan@apache.org>2010-04-25 13:00:54 +0000
commit1f919c38279deeeae69baf01f801017f7de45f9f (patch)
treed94c070a4d879958d1f0e52aff9974194b478746 /src
parentb847d9298141f76e0444099e05bbc229f93f6461 (diff)
make before commit, make before commit, make before commit
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@937793 13f79535-47bb-0310-9956-ffa450edef68
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;