Fix merge conflicts

SAP · Jul 19, 2023 · 8f35311 · 8f35311
1 parent 6ed1b0a
commit 8f35311
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -63,19 +63,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@nguniversal/express-engine": "^15.2.0",
-<<<<<<< HEAD
-    "@spartacus/assets": "~6.2.0-1",
-    "@spartacus/core": "~6.2.0-1",
-    "@spartacus/setup": "~6.2.0-1",
-    "@spartacus/storefront": "~6.2.0-1",
-    "@spartacus/styles": "~6.2.0-1",
-=======
     "@spartacus/assets": "~6.3.0-1",
     "@spartacus/core": "~6.3.0-1",
     "@spartacus/setup": "~6.3.0-1",
     "@spartacus/storefront": "~6.3.0-1",
     "@spartacus/styles": "~6.3.0-1",
->>>>>>> develop-6.3.x
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.15.2",