Pending changes

Author: jissereitsma

view/frontend/templates/script/alpine-csp.phtml

@@ -1,9 +1,13 @@
 <?php declare(strict_types=1);
 
+<<<<<<< HEAD
 /** @version 1.0.4 */
 
+=======
+>>>>>>> 00eb15c52329c897e0123c1db9ea2ad86adbffb7
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 
 $jsUrl = $block->getViewFileUrl('Loki_Base::js/alpine-csp.js');

view/frontend/templates/script/component/message-component.phtml

@@ -1,10 +1,14 @@
 <?php
 declare(strict_types=1);
 
+<<<<<<< HEAD
 /** @version 1.0.4 */
 
+=======
+>>>>>>> 00eb15c52329c897e0123c1db9ea2ad86adbffb7
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 
 $timeout = (int)$block->getTimeout(); // @todo Right source for this?

view/frontend/templates/script/directive/autoremove-directive.phtml

@@ -1,10 +1,14 @@
 <?php
 declare(strict_types=1);
 
+<<<<<<< HEAD
 /** @version 1.0.4 */
 
+=======
+>>>>>>> 00eb15c52329c897e0123c1db9ea2ad86adbffb7
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 ?>
 <script>

view/frontend/templates/script/store/localstorage-store.phtml

@@ -1,12 +1,16 @@
 <?php
 declare(strict_types=1);
 
+<<<<<<< HEAD
 /** @version 1.0.4 */
 
 
+=======
+>>>>>>> 00eb15c52329c897e0123c1db9ea2ad86adbffb7
 use Loki\Base\ViewModel\SectionConfig;
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 /** @var SectionConfig $sectionConfig */
 

view/frontend/templates/script/store/message-store.phtml

@@ -1,10 +1,14 @@
 <?php
 declare(strict_types=1);
 
+<<<<<<< HEAD
 /** @version 1.0.4 */
 
+=======
+>>>>>>> 00eb15c52329c897e0123c1db9ea2ad86adbffb7
 use Magento\Framework\View\Element\Template;
 
+/** @version 1.0.3 */
 /** @var Template $block */
 ?>
 <script>