From ca28d11eb9bd9318e5b8cf26a064b8ef6f1bd8f1 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 07:16:10 +0000
Subject: [PATCH] update ConflictTest2.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>
---
 ConflictTest2.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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