fix error merge

youfantan · Apr 10, 2022 · bc423b5 · bc423b5 · vercel · Apr 10, 2022
2 parents deb2f14 + 3d95d2d
commit bc423b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 build/
 .idea/
+.gradle/
 build/
 native/TesseractForASOCR/
 native/ArtifactsScore/

diff --git a/src/main/java/glous/kleebot/KleeBot.java b/src/main/java/glous/kleebot/KleeBot.java
@@ -67,7 +67,11 @@ public static HttpServer getServerInstance(){
         return serverInstance;
     }
     public static String GET_VERSION(){
+<<<<<<< HEAD
         return "%s(@%s)".formatted(FileUtils.readStream(KleeBot.class.getResourceAsStream("/RELEASE")),FileUtils.readStream(KleeBot.class.getResourceAsStream("/SIGN")));
+=======
+        return "v0.0.1(@%s)".formatted(FileUtils.readStream(KleeBot.class.getResourceAsStream("/SIGN")));
+>>>>>>> 3d95d2d79999af4867af59e09d38d393cb9ee7cf
     }
     public static int GET_OS(){
         String OSName=System.getProperty("os.name");