Баг со скриптом

Андрей Ларионов
1 parent 0b08f4d6be
Showing 2 changed files with 0 additions and 4 deletions Side-by-side Diff
public/assets/js/init-alpine.js
public/i.php
@@ -47,13 +47,10 @@ function data() {
     togglePagesMenu() {
       this.isPagesMenuOpen = !this.isPagesMenuOpen
     },
-<<<<<<< HEAD
-=======
     open1: false,
     open1() {
       this.open1 = !this.open1
     },
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     // Modal
     isModalOpen: false,
     trapCleanup: null,
@@ -1 +0,0 @@
-<? phpinfo(); ?>
...	...	@@ -47,13 +47,10 @@ function data() {
47	47	togglePagesMenu() {
48	48	this.isPagesMenuOpen = !this.isPagesMenuOpen
49	49	},
50		-<<<<<<< HEAD
51		-=======
52	50	open1: false,
53	51	open1() {
54	52	this.open1 = !this.open1
55	53	},
56		->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
57	54	// Modal
58	55	isModalOpen: false,
59	56	trapCleanup: null,