Author: echatellier Date: 2014-05-07 12:05:50 +0200 (Wed, 07 May 2014) New Revision: 408 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/408 Log: Update version to 1.11.1 Modified: nuiton-js-jquery/trunk/pom.xml Modified: nuiton-js-jquery/trunk/pom.xml =================================================================== --- nuiton-js-jquery/trunk/pom.xml 2014-05-07 10:05:32 UTC (rev 407) +++ nuiton-js-jquery/trunk/pom.xml 2014-05-07 10:05:50 UTC (rev 408) @@ -14,11 +14,7 @@ </parent> <artifactId>nuiton-js-jquery</artifactId> -<<<<<<< .mine <version>1.11.1-1-SNAPSHOT</version> -======= - <version>2.1.0-2-SNAPSHOT</version> ->>>>>>> .r406 <name>Nuiton JS :: JQuery</name> <description>JQuery jar packaging</description>