From 539cdee1605d9cdb32c8aac43e3d30fd3a554236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=90=AF=E6=96=87?=
 <13781511+li-qiwen2@user.noreply.gitee.com>
Date: Fri, 1 Dec 2023 09:33:02 +0000
Subject: [PATCH] update ConflictTest1.java.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 李启文 <13781511+li-qiwen2@user.noreply.gitee.com>
---
 ConflictTest1.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ConflictTest1.java b/ConflictTest1.java
index ac0febf..e54a599 100644
--- a/ConflictTest1.java
+++ b/ConflictTest1.java
@@ -22,6 +22,6 @@ public class ConflictTest1 {
      */
     public static int add(int a, int b) {
         // todo 这里有一个Bug需要修复
-        return a - b;
+        return a + b;
     }
 }
-- 
Gitee