From a07716c7a3315b64be07752f15cfbdbf45b4957e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= <quentin.guidee@gmail.com>
Date: Sat, 10 Aug 2019 11:20:05 +0200
Subject: [PATCH] Fix: problem config.mak

---
 scripts/config.mak | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/config.mak b/scripts/config.mak
index 894a3f4cf..e1a25a34f 100644
--- a/scripts/config.mak
+++ b/scripts/config.mak
@@ -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