From 032b65952188eeaded3157ac47e970b90eacdc96 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 2 Oct 2014 17:16:58 +0200 Subject: Fix bad merge --- src/main/resources/textFiles/license.html | 6 ++---- 1 file 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 @@ +License info

Cristal Kernel

Copyright (c) 2001-2014 The CRISTAL Consortium. All Rights Reserved.

This library is free software; you can redistribute it and/or modify it @@ -38,7 +39,4 @@

  • Castor License: http://castor.codehaus.org/license.html
  • XML Unit License: http://sourceforge.net/p/xmlunit/code/HEAD/tree/trunk/xmlunit/LICENSE.txt -
  • SAX License: http://www.saxproject.org/?selected=pd -
  • Castor License: http://www.castor.org/license.html -
  • JSW License: http://wrapper.tanukisoftware.org/doc/english/license.html - + \ No newline at end of file -- cgit v1.2.3