Commit 18c39b0f authored by Brian Long's avatar Brian Long
Browse files

fix merge

parent b7aa6151

asie-api/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>com.inteligr8.alfresco</groupId>

		<artifactId>asie-platform-module-parent</artifactId>

		<version>1.0-SNAPSHOT</version>

		<version>1.0.0</version>

		<relativePath>../</relativePath>

	</parent>

solr-api/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>com.inteligr8.alfresco</groupId>

		<artifactId>asie-platform-module-parent</artifactId>

		<version>1.0-SNAPSHOT</version>

		<version>1.0.0</version>

		<relativePath>../</relativePath>

	</parent>