From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/test/java/org/fanli/AppTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/AppTest.java b/fanli/src/test/java/org/fanli/AppTest.java
index 7b6fc38..2451478 100644
--- a/fanli/src/test/java/org/fanli/AppTest.java
+++ b/fanli/src/test/java/org/fanli/AppTest.java
@@ -7,7 +7,7 @@
import junit.framework.TestSuite;
/**
- * Unit test for simple App.
+ * Unit test for simple
*/
@Ignore
public class AppTest extends TestCase {
--
Gitblit v1.8.0