community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
merge-requests/1/head
warunalakshitha 7 years ago
parent cbce05311b
commit fac10f81e5
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File

11
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -755,19 +755,17 @@
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Geo Dashboard feature --> <!-- End of Geo Dashboard feature -->
<<<<<<< HEAD
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Realtime Operations Feature --> <!-- End of Realtime Operations Feature -->
=======
<!--MQTT Dashboard--> <!--MQTT Dashboard-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -2541,20 +2539,18 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- End of Geo Dashboard Feature -->
<<<<<<< HEAD
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.remote.session.feature.group</id> <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Realtime Operations Feature --> <!-- End of Realtime Operations Feature -->
=======
<!--MQTT Dashboard Feature--> <!--MQTT Dashboard Feature-->
<feature> <feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id> <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -3189,20 +3185,17 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- End of Geo Dashboard Feature -->
<<<<<<< HEAD
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.remote.session.feature.group</id> <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Realtime Operations Feature --> <!-- End of Realtime Operations Feature -->
=======
<!--MQTT Dashboard Feature--> <!--MQTT Dashboard Feature-->
<feature> <feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id> <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
</features> </features>
</configuration> </configuration>
</execution> </execution>

Write Preview
Loading…
Cancel
Save