UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: problem config.mak

Browse Source
This commit is contained in:
Quentin Guidée
2019-08-10 11:20:05 +02:00
parent fe946bc057
commit a07716c7a3
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/config.mak
View File

@@ -3,19 +3,9 @@
PLATFORM ?= device
DEBUG ?= 0
<<<<<<< HEAD
EPSILON_VERSION ?= 11.2.0
EPSILON_ONBOARDING_APP ?= 1
=======
<<<<<<< Updated upstream
EPSILON_VERSION ?= 11.1.0
EPSILON_ONBOARDING_APP ?= 0
=======
EPSILON_VERSION ?= 11.2.0
EPSILON_CUSTOM_VERSION ?= 1.0
EPSILON_ONBOARDING_APP ?= 1
>>>>>>> Stashed changes
>>>>>>> cfba77e1f... Add: LavaOS version in 'about' settings
# Valid values are "none", "update", "beta"
EPSILON_BOOT_PROMPT ?= none
EPSILON_APPS ?= calculation graph code statistics probability solver sequence regression settings