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

Commit 637c0192 authored by Ian Pedowitz's avatar Ian Pedowitz
Browse files

resolve merge conflicts of f2304ce3 to nyc-mr1-dev 

Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
parents 216b1ed2 f2304ce3

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" 
  # This is all of the development codenames that are active.  Should be either

  # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional

  # codenames after PLATFORM_VERSION_CODENAME.

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N

endif



ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"