fix: remove version conflict markers [skip ci]

2026-05-30 22:54:29 +00:00
parent c42a23d739
commit a2d494544b
1 changed files with 0 additions and 4 deletions
@@ -36,11 +36,7 @@
 		</server>
 	</updateservers>
 	<name>mokoonyx</name>
-<<<<<<< HEAD
 	<version>02.15.01-dev</version>
-=======
-	<version>02.15.00</version>
->>>>>>> origin/main
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-05-16</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>