Documentation

Vizzuality · Jun 13, 2024 · cdb645d · cdb645d
1 parent dabc3d7
commit cdb645d
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -21,15 +21,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "x-generation-date": "2024-06-13T08:40:32.783Z"
-=======
-    "x-generation-date": "2024-06-10T15:12:02.509Z"
->>>>>>> b45498b (Masks: first steps)
-=======
-    "x-generation-date": "2024-06-11T07:40:26.624Z"
->>>>>>> f9c9c30 (Masks: geojson)
+    "x-generation-date": "2024-06-13T08:46:14.873Z"
   },
   "servers": [
     {