Fix decofile

Signed-off-by: Marcos Candeia <[email protected]>
deco-sites · Mar 20, 2024 · fb1e653 · fb1e653
1 parent 8bdf771
commit fb1e653
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.deco/decofile.json b/.deco/decofile.json
@@ -1,7 +1,4 @@
 {
-<<<<<<< HEAD
-    "site": {"__resolveType": "deco-sites/start/apps/site.ts"}
-=======
   "site": {
     "seo": {
       "type": "website",
@@ -32,5 +29,4 @@
   "decohub": {
     "__resolveType": "deco-sites/start/apps/decohub.ts"
   }
->>>>>>> a3de109 (Making start work with spaces)
 }