conflict fixed

leijing1992 · Mar 6, 2017 · f78aaa7 · f78aaa7
1 parent ce5fd83
commit f78aaa7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/group04/1906242834/src/com/coderising/litestruts/Struts.java b/group04/1906242834/src/com/coderising/litestruts/Struts.java
@@ -31,8 +31,6 @@ public static View runAction(String actionName, Map<String,String> parameters) {
     	return null;
     }    
 
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/Struts.java
 
-=======
 }
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/Struts.java
+
diff --git a/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java b/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
@@ -40,8 +40,8 @@ public void testLoginActionFailed() {
         Assert.assertEquals("/jsp/showLogin.jsp", view.getJsp());
         Assert.assertEquals("login failed,please check your user/pwd", view.getParameters().get("message"));
 	}
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
+
 }
-=======
 
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/StrutsTest.java
+
+
diff --git a/group04/1906242834/src/com/coderising/litestruts/struts.xml b/group04/1906242834/src/com/coderising/litestruts/struts.xml
@@ -1,6 +1,6 @@
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/struts.xml
-<?xml version="1.0" encoding="UTF-8"?>
-=======
+
+
+
 <?xml version="1.0" encoding="UTF-8"?>
 <struts>
     <action name="login" class="com.coderising.litestruts.LoginAction">
@@ -11,5 +11,4 @@
     	<result name="success">/jsp/welcome.jsp</result>
     	<result name="error">/jsp/error.jsp</result>
     </action>
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/struts.xml
 </struts>
diff --git a/group04/564451732/hw2/.classpath b/group04/564451732/hw2/.classpath
@@ -1,10 +1,7 @@
-<<<<<<< HEAD:group04/564451732/hw2/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
-=======
->>>>>>> upstream/master:liuxin/.classpath