Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be72bd17 authored by Jef Oliver's avatar Jef Oliver
Browse files

Fix merge conflict

parent 57689e0b

config/common.mk

+0 −4
Original line number Diff line number Diff line
@@ -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