From cdb645d2dec8db2bbe81745f452f8d4850cf2578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Barrenechea=20S=C3=A1nchez?=
 <miguel.barrenechea@vizzuality.com>
Date: Thu, 13 Jun 2024 10:46:35 +0200
Subject: [PATCH] Documentation

---
 .../documentation/1.0.0/full_documentation.json        | 10 +---------
 1 file changed, 1 insertion(+), 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
index 2f9aaed..e9b75ec 100644
--- 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": [
     {