diff options
| author | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 10:24:15 -0700 |
|---|---|---|
| committer | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 10:24:15 -0700 |
| commit | b1daf92d64bcb2b5f335a844bf695af5bf9fe80f (patch) | |
| tree | 486570e598784122f90ed970739b1dd4118145f3 | |
| parent | b8fe4433774536101ad35582cd09d51d115a30ef (diff) | |
| download | vendor_replicant-b1daf92d64bcb2b5f335a844bf695af5bf9fe80f.zip vendor_replicant-b1daf92d64bcb2b5f335a844bf695af5bf9fe80f.tar.gz vendor_replicant-b1daf92d64bcb2b5f335a844bf695af5bf9fe80f.tar.bz2 | |
Fix merge conflict
| -rw-r--r-- | config/common.mk | 4 |
1 files changed, 0 insertions, 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 |