From 8922dff9dfa24053a332cfa5a3f8a58e09d59a58 Mon Sep 17 00:00:00 2001
From: Charles Knowlton <neosmith@tuffmail.com>
Date: Mon, 17 Jan 2011 17:43:13 -0600
Subject: [PATCH] Updated to version 2

---
 3.0/modules/user_info/module.info | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/3.0/modules/user_info/module.info b/3.0/modules/user_info/module.info
index ec6e6b0d..2dabd3d9 100644
--- a/3.0/modules/user_info/module.info
+++ b/3.0/modules/user_info/module.info
@@ -1,7 +1,3 @@
 name = "User Info"
 description = "Login Information"
-<<<<<<< HEAD
 version = 2
-=======
-version = 1
->>>>>>> d537136570ba6c51df8b572901e395018d9ef629