From d8486a64ace40422dcb15bd048517d78e718f00c Mon Sep 17 00:00:00 2001
From: FanJunling <fan_junling@163.com>
Date: Thu, 25 Nov 2021 20:47:09 +0800
Subject: [PATCH] edit by fjl erb/test/merge.java

---
 web/test/merge.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/test/merge.java b/web/test/merge.java
index 2f45a0b6..c6fba887 100644
--- a/web/test/merge.java
+++ b/web/test/merge.java
@@ -5,3 +5,4 @@ class Person{
     int only_me = 1;
     int x = 11;
 }
+######edit second by fjl
-- 
Gitee