Project file fix (removing merge conflict markers)

rjackey · rjackey · commit 2b1296bef2b8 · 2025-09-25T08:42:48.000-04:00
diff --git a/resources/project/LwJcy9ZaEyJvuNK-ApM3PZoS5oo/zElVE5iTAf8BJd9MCDX_B5ptDqYd.xml b/resources/project/LwJcy9ZaEyJvuNK-ApM3PZoS5oo/zElVE5iTAf8BJd9MCDX_B5ptDqYd.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
-=======
-<?xml version='1.0' encoding='UTF-8'?>
->>>>>>> stash
 <Info>
     <Category UUID="FileClassCategory">
         <Label UUID="design"/>
