From 38456661a1e108c8e3166f2142ecc909d08aee2f Mon Sep 17 00:00:00 2001
From: SunNan-code <13944540+sunnan-code@user.noreply.gitee.com>
Date: Mon, 8 Jan 2024 06:39:34 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9D=8E=E5=9B=9B=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: SunNan-code <13944540+sunnan-code@user.noreply.gitee.com>
---
 ConflictTest1.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ConflictTest1.java b/ConflictTest1.java
index ac0febf..e7bf75a 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