From 278d1dd999f017e93123743cfdc920d0f19599e0 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Sat, 24 Apr 2010 15:30:08 +0000
Subject: tabs to spaces

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@937633 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_view.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/couchdb')

diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index 80850b65..085b1acf 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -90,8 +90,8 @@ cleanup_index_files(Db) ->
 
     % filter out the ones in use
     DeleteFiles = [FilePath
-		   || FilePath <- FileList,
-		      re:run(FilePath, RegExp, [{capture, none}]) =:= nomatch],
+           || FilePath <- FileList,
+              re:run(FilePath, RegExp, [{capture, none}]) =:= nomatch],
     % delete unused files
     ?LOG_DEBUG("deleting unused view index files: ~p",[DeleteFiles]),
     [file:delete(File)||File <- DeleteFiles],
@@ -369,6 +369,7 @@ 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