Configuration documentation updated

owncloud · May 7, 2024 · 60834c9 · 60834c9
1 parent 9414f97
commit 60834c9
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/doc/CONFIGURATION.json b/doc/CONFIGURATION.json
@@ -78,8 +78,6 @@
         "value" : "com.owncloud.action.openin"
       },
       {
-=======
->>>>>>> milestone/12.3
         "description" : "Go to page",
         "value" : "com.owncloud.action.pdfpage"
       },
@@ -2666,4 +2664,4 @@
     "status" : "advanced",
     "type" : "stringArray"
   }
-]
+]