Fixed conflicts and merged

This commit is contained in:
Milan Perera 2017-01-03 10:43:55 +05:30
commit f173426c1b

View File

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