From 2ccf60a6ec77219dd6ce57afa2b848b1474430e6 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 1 Mar 2017 13:49:55 -0500
Subject: [PATCH] fixed duplicate uninstall button

---
 src/views/admin/partials/installed_plugin_item.tpl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/admin/partials/installed_plugin_item.tpl b/src/views/admin/partials/installed_plugin_item.tpl
index b76ae9f964..2e95606ef8 100644
--- a/src/views/admin/partials/installed_plugin_item.tpl
+++ b/src/views/admin/partials/installed_plugin_item.tpl
@@ -36,13 +36,7 @@
 					<li data-plugin-id="{installed.id}" class="clearfix">
 						<div class="pull-right">
 							<button class="btn btn-default disabled"><i class="fa fa-exclamation-triangle"></i> [[admin/extend/plugins:plugin-item.unknown]]</button>
-
-<<<<<<< HEAD
-							<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
-
-=======
 							<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> [[admin/extend/plugins:plugin-item.uninstall]]</button>
->>>>>>> `admin/extend` translations
 						</div>
 
 						<h2><strong>{installed.id}</strong></h2>