Jihan Kim 2013-05-09
fix merge failures
@8859bcd5ac87afe9eefe30ede02096ccf0de8eaa
app/views/issue/newIssue.scala.html
--- app/views/issue/newIssue.scala.html
+++ app/views/issue/newIssue.scala.html
@@ -143,4 +143,4 @@
 		});
 	});
 </script>
-}
(No newline at end of file)
+}
app/views/project/delete.scala.html
--- app/views/project/delete.scala.html
+++ app/views/project/delete.scala.html
@@ -44,4 +44,4 @@
         $hive.loadModule("project.Delete");
 	});
 </script>
-}
(No newline at end of file)
+}
Add a comment
List