couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r937793 - /couchdb/trunk/src/couchdb/couch_view.erl
Date Sun, 25 Apr 2010 13:00:54 GMT
Author: jan
Date: Sun Apr 25 13:00:54 2010
New Revision: 937793

URL: http://svn.apache.org/viewvc?rev=937793&view=rev
Log:
make before commit, make before commit, make before commit

Modified:
    couchdb/trunk/src/couchdb/couch_view.erl

Modified: couchdb/trunk/src/couchdb/couch_view.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_view.erl?rev=937793&r1=937792&r2=937793&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_view.erl Sun Apr 25 13:00:54 2010
@@ -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;



Mime
View raw message