community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict fix

Browse Source
This commit is contained in:
Imesh Chandrasiri 2017-02-15 10:46:07 +05:30
commit bccc47ebd2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
View File

@ -60,6 +60,9 @@
</div>
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37b032d710277e6f0bea0402b7d5c2db9e512314
<!--<div class="row">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double ">
<h3 class="uppercase">What You Need</h3>
@ -78,6 +81,7 @@
<br>
</div>
</div>
<<<<<<< HEAD
=======
<a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
<a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
@ -88,6 +92,8 @@
<a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
{{/if}}
>>>>>>> 32c50e0ef78961ec90a3ed9b44c8237adb40a41e
=======
>>>>>>> 37b032d710277e6f0bea0402b7d5c2db9e512314
<div class="row">
<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
@ -107,9 +113,6 @@
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
<h3 class="uppercase">Prepare</h3><hr>
<ul class="list-unstyled">