From 53c9ef81fed9216e5b52acc94d49a1b2007345c6 Mon Sep 17 00:00:00 2001
From: WangX-Code <13944542+wangx-code@user.noreply.gitee.com>
Date: Mon, 8 Jan 2024 06:40:42 +0000
Subject: [PATCH] update ConflictTest1.java.

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