From d8a6d3d7f25027f06f23a93441c49aad5f9f9ee1 Mon Sep 17 00:00:00 2001
From: mgroves <mgroves@telligent.com>
Date: Sat, 5 Feb 2011 20:54:59 -0500
Subject: [PATCH] what now
---
MonoStockPortfolio/Activites/ConfigActivity.cs | 7 -------
1 file changed, 7 deletions(-)
diff --git a/MonoStockPortfolio/Activites/ConfigActivity.cs b/MonoStockPortfolio/Activites/ConfigActivity.cs
index 7388e6b..edee878 100644
--- a/MonoStockPortfolio/Activites/ConfigActivity.cs
+++ b/MonoStockPortfolio/Activites/ConfigActivity.cs
@@ -4,17 +4,10 @@ using Android.App;
using Android.Content;
using Android.OS;
using Android.Preferences;
-<<<<<<< HEAD
using MonoStockPortfolio.Core;
using MonoStockPortfolio.Core.Config;
using MonoStockPortfolio.Entities;
using MonoStockPortfolio.Framework;
-=======
-using MonoStockPortfolio.Core.Config;
-using MonoStockPortfolio.Entities;
-using MonoStockPortfolio.Framework;
-using MonoStockPortfolio.Core;
->>>>>>> develop
namespace MonoStockPortfolio.Activites
{