desc

i have no idea why it kept the headers there even though i fixed them. should be all good now tho
2026-08-21 13:36:21 -04:00 · 2026-06-02 12:42:44 -04:00
parent b0adddf70f
commit b01b8cf8df
2 changed files with 7 additions and 9 deletions
@@ -4,12 +4,8 @@ out/
 !**/src/test/**/out/
 .kotlin
 XACrypto.jar
-<<<<<<< HEAD
 tests
-.idea/
-=======
 .idea
->>>>>>> main

 ### Eclipse ###
 .apt_generated