From f9654cb4298447032b609d8cbca6b5a04c5590ed Mon Sep 17 00:00:00 2001
From: WangX-Code <13944542+wangx-code@user.noreply.gitee.com>
Date: Mon, 8 Jan 2024 06:55:36 +0000
Subject: [PATCH] update ConflictTest2.java.

Signed-off-by: WangX-Code <13944542+wangx-code@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