From 1f919c38279deeeae69baf01f801017f7de45f9f Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Sun, 25 Apr 2010 13:00:54 +0000
Subject: 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
---
 src/couchdb/couch_view.erl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/couchdb/couch_view.erl')

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;
-- 
cgit v1.2.3