From 2cd14a56252333d3372b03bd70287c350c1ce484 Mon Sep 17 00:00:00 2001
From: kanwangcheng <13944571+kanwangcheng@user.noreply.gitee.com>
Date: Mon, 8 Jan 2024 06:41:10 +0000
Subject: [PATCH] =?UTF-8?q?update=20ConflictTest1.java.=20=E5=BC=A0?=
 =?UTF-8?q?=E4=B8=89=E6=94=B9=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: kanwangcheng <>
---
 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