From 20bd1b399b1025182088f3ad5bd844374383c15f Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Wed, 15 Feb 2017 11:16:41 +0530
Subject: [PATCH] Removed conflict markings

---
 .../type-view.hbs                               | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/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 b/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
index 6b9257a33..f6af817ef 100644
--- a/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
+++ b/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
@@ -59,10 +59,6 @@
     </div>
 </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>
@@ -81,19 +77,6 @@
         <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>
-    {{#unless isCloud}}
-    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
-    {{/unless}}
-    {{#if displayStatus}}
-        <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">