Changed a file
diff --git a/.project b/.project
new file mode 100644
index 0000000..8884071
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Demo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
index f61594b..caa9ff4 100644
--- a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
+++ b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
@@ -12,7 +12,7 @@
<<<<<<< HEAD
<h1>Cognizant Test </h1>
=======
-<h1>Cognizant Technology </h1>
+<h1>Cognizant Technology sloution</h1>
>>>>>>> 46b94971157004bc4e2b04087cbc98cdd0caf8ef
<form:form method="POST" commandName="user">