[couchdb] 09/10: ss - implement pse

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch COUCHDB-3287-pluggable-storage-engines
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit effa8bf34b45e41158cc51f35369b60a74952abc
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Fri May 12 16:07:55 2017 -0500

    ss - implement pse
---
 src/couch/src/couch_db_updater.erl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl
index 2e6bf29..f301ac1 100644
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@ -48,7 +48,6 @@ init({Engine, DbName, FilePath, Options0}) ->
 
 
 terminate(Reason, Db) ->
->>>>>>> Implement pluggable storage engines
     couch_util:shutdown_sync(Db#db.compactor_pid),
     couch_db_engine:terminate(Reason, Db),
     ok.

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.