#HT-1 解决冲突#

# Conflicts:
#	interface/TestUpdate.jsp

Test/Test.jsp.tld

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
-        version="2.1">
-
-    <tlib-version>1.0</tlib-version>
-    <short-name>myshortname</short-name>
-    <uri>http://mycompany.com</uri>
-
-    <!-- Invoke 'Generate' action to add tags or functions -->
-
-</taglib>

interface/TestUpdate.jsp

@@ -0,0 +1,6 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%
+    int count = 0;
+    String cs = "";
+    String test = "11111";
+%>

src/weaver/interfaces/shil/UpdateStatusAction.java

@@ -0,0 +1,4 @@
+package weaver.interfaces.shil;
+
+public class UpdateStatusAction {
+}