diff options
Diffstat (limited to 'config/common.mk')
| -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 |