From a5bd1b584e0847b27607f144683eaab20faa9b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien?= Date: Tue, 1 Oct 2019 22:55:46 -0400 Subject: [PATCH] Update org.eclipse.cdt.core.prefs --- .settings/org.eclipse.cdt.core.prefs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs index 2f94b6b6..f7f85a48 100644 --- a/.settings/org.eclipse.cdt.core.prefs +++ b/.settings/org.eclipse.cdt.core.prefs @@ -1,6 +1,4 @@ -=\=\=\=\=\=\= -<<<<<<<=HEAD ->>>>>>>=refs/remotes/origin/Over_The_Air_Update + eclipse.preferences.version=1 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/delimiter=\: environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/operation=append