[#] fix:合并分支时弄错了

NekoCurit · Feb 22, 2024 · 4135de0 · 4135de0
1 parent fa1e976
commit 4135de0
Show file tree

Hide file tree

Showing 32 changed files with 0 additions and 1,001 deletions.
diff --git a/CozeProxy/build.gradle b/CozeProxy/build.gradle
@@ -1,15 +1,12 @@
 plugins {
     id 'java'
-<<<<<<< HEAD
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 
 build{
     dependsOn {
         shadowJar
     }
-=======
->>>>>>> dev
 }
 
 jar {
@@ -26,21 +23,14 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 group = 'catx.feitu'
-<<<<<<< HEAD
-version = '1.0.0213'
-=======
 version = '1.0.0222'
->>>>>>> dev
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-<<<<<<< HEAD
-=======
     // 协议
->>>>>>> dev
     // Discord API
     implementation 'org.javacord:javacord:3.8.0'
 
@@ -49,14 +39,10 @@ dependencies {
     implementation "com.slack.api:bolt-servlet:1.38.1"
     implementation "com.slack.api:bolt-jetty:1.38.1"
     implementation "org.slf4j:slf4j-simple:1.7.36"
-<<<<<<< HEAD
-}
-=======
 
     // 依赖
     // fastjson
     implementation 'com.alibaba:fastjson:1.1.77.android_noneautotype'
 
     implementation project(':DiscordSelfBot')
 }
->>>>>>> dev
diff --git a/CozeProxy/src/main/java/catx.feitu.CozeProxy/ConversationManage/ConversationData.java b/CozeProxy/src/main/java/catx.feitu.CozeProxy/ConversationManage/ConversationData.java
diff --git a/CozeProxy/src/main/java/catx.feitu.CozeProxy/ConversationManage/ConversationHelper.java b/CozeProxy/src/main/java/catx.feitu.CozeProxy/ConversationManage/ConversationHelper.java