Remove extraneous merge markers

Author: ethanbb

Builds/VisualStudio2013/Plugins/Plugins.sln

@@ -313,7 +313,6 @@ Global
 		{F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|Win32.Build.0 = Release|Win32
 		{F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|x64.ActiveCfg = Release|x64
 		{F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|x64.Build.0 = Release|x64
-<<<<<<< HEAD
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -326,7 +325,6 @@ Global
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Release|Win32.Build.0 = Release|Win32
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Release|x64.ActiveCfg = Release|x64
 		{1DD9DB7A-A9D8-4982-9FA3-1AEAFEC5FC1B}.Release|x64.Build.0 = Release|x64
-=======
 		{13A9AA65-5A8C-4DDF-B005-4477D4154E76}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{13A9AA65-5A8C-4DDF-B005-4477D4154E76}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{13A9AA65-5A8C-4DDF-B005-4477D4154E76}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -351,7 +349,6 @@ Global
 		{BEE7D50B-D914-43EC-975C-3FE2FC36E40D}.Release|Win32.Build.0 = Release|Win32
 		{BEE7D50B-D914-43EC-975C-3FE2FC36E40D}.Release|x64.ActiveCfg = Release|x64
 		{BEE7D50B-D914-43EC-975C-3FE2FC36E40D}.Release|x64.Build.0 = Release|x64
->>>>>>> testing
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE