This commit is contained in:
mgroves 2011-02-05 20:54:59 -05:00
parent 29fe11504e
commit d8a6d3d7f2

View file

@ -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
{