rollback _conflicts view patch

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@803690 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 10 deletions

diff --git a/share/www/script/couch.js b/share/www/script/couch.js
index eba60ad5..e902a730 100644
--- a/share/www/script/couch.js
+++ b/share/www/script/couch.js
@@ -191,18 +191,10 @@ function CouchDB(name, httpHeaders) {
   }
 
   this.allDocs = function(options,keys) {
-    return this.builtinView("_all_docs", options, keys)
-  }
-
-  this.conflicts = function(options,keys) {
-    return this.builtinView("_conflicts", options, keys)
-  }
-
-  this.builtinView = function(name, options, keys) {
     if(!keys) {
-      this.last_req = this.request("GET", this.uri + name + encodeOptions(options));
+      this.last_req = this.request("GET", this.uri + "_all_docs" + encodeOptions(options));
     } else {
-      this.last_req = this.request("POST", this.uri + name + encodeOptions(options), {
+      this.last_req = this.request("POST", this.uri + "_all_docs" + encodeOptions(options), {
         headers: {"Content-Type": "application/json"},
         body: JSON.stringify({keys:keys})
       });