fix merge issues.

typerefinery-ai · Jun 2, 2023 · 4a1fb61 · 4a1fb61
1 parent fe88e0f
commit 4a1fb61
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 89 deletions.
diff --git a/application/backend/.editorconfig b/application/backend/.editorconfig
@@ -1,9 +1,6 @@
 [*]
 indent_style = space
-<<<<<<< HEAD
-=======
 indent_size = 2
->>>>>>> develop
 
 [*.java]
 indent_size = 4
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/actions/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/actions/package-info.java
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/actions/pages/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/actions/pages/package-info.java
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/package-info.java
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/rest/assets/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/rest/assets/package-info.java
diff --git a/build.ps1 b/build.ps1
@@ -1,11 +1,7 @@
-<<<<<<< HEAD
-mvn clean install
-=======
 $CURRENT_PATH = Get-Location
 Set-Location -Path ".\"
 try {
     mvn clean install
 } finally {
     Set-Location -Path $CURRENT_PATH
 }
->>>>>>> develop
diff --git a/distribution/src/main/features/typerefinery.json b/distribution/src/main/features/typerefinery.json
@@ -74,8 +74,7 @@
       "sling.additional.response.headers":[
         "X-Content-Type-Options=nosniff",
         "Cache-control=no-cache",
-        "Strict-Transport-Security=max-age=31536000",
-        "SameSite=None"
+        "Strict-Transport-Security=max-age=31536000"
       ]
     },
     "pl.ds.websight.publishing.connectors.filesystem.FileSystemStorageConnector~typerefinery": {