From fc755b42693b7cb282590347b340e91a601df883 Mon Sep 17 00:00:00 2001
From: Aaron Oneal <aaron.oneal@spicypixel.com>
Date: Fri, 7 Jun 2013 00:48:41 -0700
Subject: [webdoc] Remove a merge conflict artifact breaking the install

---
 webdoc/plugins.def | 1 -
 1 file changed, 1 deletion(-)

(limited to 'webdoc')

diff --git a/webdoc/plugins.def b/webdoc/plugins.def
index f4c60a1c..43861fd2 100644
--- a/webdoc/plugins.def
+++ b/webdoc/plugins.def
@@ -1,5 +1,4 @@
 #####SKIN (pick ONE)#####
-<<<<<<< HEAD
 #skins/xamarin-external
 #skins/mono-external
 #skins/xamarin-new
-- 
cgit v1.2.3