From 76a8e3ca58e987df40fc0c265d1f7c867c131454 Mon Sep 17 00:00:00 2001
From: "haoeliu@foxmail.com" <haoeliu@foxmail.com>
Date: Tue, 29 Nov 2022 15:22:44 +0800
Subject: [PATCH] fix the conflicts in build.gradle

---
 build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9f9a47c..952ae7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,8 @@ plugins {
 }
 
 group = "org.bdware.sc"
-<<<<<<< HEAD
 version = "2.0.0"
-=======
-version = "1.7.2"
->>>>>>> origin/master
+
 repositories {
     mavenCentral()
     mavenLocal()