solve merge conflicts

Sitecore · Aug 5, 2024 · dbf8ad3 · dbf8ad3
1 parent 8dcba46
commit dbf8ad3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,8 +26,8 @@ Our versioning strategy is as follows:
 * `[create-sitecore-jss]` Rework Angular initializer to support XMCloud and SXP journeys ([#1845](https://github.com/Sitecore/jss/pull/1845))([#1858](https://github.com/Sitecore/jss/pull/1858))
 * `[create-sitecore-jss]` Allows proxy apps to be installed alongside main apps ([#1858](https://github.com/Sitecore/jss/pull/1858))
   * `nodeAppDestination` arg can be passed into `create-sitecore-jss` command to define path for proxy to be installed in
-* `[create-sitecore-jss]``[template/angular-xmcloud]` Angular SXA components ([#1864](https://github.com/Sitecore/jss/pull/1864))
-* `[sitecore-jss-angular]` Angular placeholder now supports SXA components ([#1870](https://github.com/Sitecore/jss/pull/1870))
+* `[create-sitecore-jss]``[template/angular-xmcloud]` Angular SXA components ([#1864](https://github.com/Sitecore/jss/pull/1864))([#1872](https://github.com/Sitecore/jss/pull/1872))
+* `[sitecore-jss-angular]` Angular placeholder now supports SXA components ([#1870](https://github.com/Sitecore/jss/pull/1870))([#1872](https://github.com/Sitecore/jss/pull/1872))
 
 ### 🛠 Breaking Change
 

diff --git a/...e-jss/src/templates/angular-xmcloud/src/app/components/container/container.component.html b/...e-jss/src/templates/angular-xmcloud/src/app/components/container/container.component.html
@@ -12,4 +12,4 @@
       </div>
     </div>
   </div>
-</ng-template>
+</ng-template>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ @@
           </div>
         </div>
       </div>
-    </ng-template>
+    </ng-template>