add files

2026-02-12 00:08:29 +01:00
parent 89d449288a
commit a06b39f328
52 changed files with 1409 additions and 1 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Compiled class file
 *.class

@@ -24,4 +25,21 @@ hs_err_pid*
 replay_pid*

 # Kotlin Gradle plugin data, see https://kotlinlang.org/docs/whatsnew20.html#new-directory-for-kotlin-data-in-gradle-projects
-.kotlin/
+.kotlin/
+=======
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+>>>>>>> c8e81fd (add files)