diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-10-02 17:16:58 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-10-02 17:16:58 +0200 |
| commit | 032b65952188eeaded3157ac47e970b90eacdc96 (patch) | |
| tree | 380010e89c8e5e0958b420211cbc6a0da4dd34a6 | |
| parent | e2c6d5041fe47c3d76bff5a0f55e13a07dff4518 (diff) | |
Fix bad merge
| -rw-r--r-- | src/main/resources/textFiles/license.html | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/resources/textFiles/license.html b/src/main/resources/textFiles/license.html index 4f82a83..0c39cef 100644 --- a/src/main/resources/textFiles/license.html +++ b/src/main/resources/textFiles/license.html @@ -1,3 +1,4 @@ +<html><head><title>License info</title></head><body>
<h3>Cristal Kernel</h3>
<i>Copyright (c) 2001-2014 The CRISTAL Consortium. All Rights Reserved.</i>
<p>This library is free software; you can redistribute it and/or modify it
@@ -38,7 +39,4 @@ <li>Castor License: <a href="http://castor.codehaus.org/license.html">http://castor.codehaus.org/license.html</a>
<li>XML Unit License: <a href="http://sourceforge.net/p/xmlunit/code/HEAD/tree/trunk/xmlunit/LICENSE.txt">http://sourceforge.net/p/xmlunit/code/HEAD/tree/trunk/xmlunit/LICENSE.txt</a>
</ul> - <li>SAX License: <a href="http://www.saxproject.org/?selected=pd">http://www.saxproject.org/?selected=pd</a>
- <li>Castor License: <a href="http://www.castor.org/license.html">http://www.castor.org/license.html</a>
- <li>JSW License: <a href="http://wrapper.tanukisoftware.org/doc/english/license.html">http://wrapper.tanukisoftware.org/doc/english/license.html</a>
-</ul>
+</body></html>
\ No newline at end of file |