From b1daf92d64bcb2b5f335a844bf695af5bf9fe80f Mon Sep 17 00:00:00 2001
From: Jef Oliver <jgoliver@jeago.com>
Date: Tue, 28 Aug 2012 10:24:15 -0700
Subject: Fix merge conflict

---
 config/common.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index ebfbc24..177feb0 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -119,11 +119,7 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
 PRODUCT_VERSION_MAJOR = 9
-<<<<<<< HEAD
-PRODUCT_VERSION_MINOR = 0
-=======
 PRODUCT_VERSION_MINOR = 1
->>>>>>> ics
 PRODUCT_VERSION_MAINTENANCE = 0
 
 # Set CM_BUILDTYPE
-- 
cgit v1.1