Fixed conflicts and merged

This commit is contained in:
Milan Perera 2016-12-14 09:20:42 +05:30
commit 05b178f9f1

View File

@ -21,7 +21,7 @@
<parent>
<artifactId>virtual-fire-alarm-plugin</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>3.0.3-SNAPSHOT</version>
<version>3.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>