From c2bb49b0ba07a036815bde6d1db21afd800ebbd8 Mon Sep 17 00:00:00 2001
From: pinkit-cwa <67099188+pinkit-cwa@users.noreply.github.com>
Date: Fri, 21 Aug 2020 03:46:48 +0200
Subject: [PATCH] reverted conflict resolution

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e884017..e5c1182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,6 @@ build
 dependencies.lock
 
 sdkconfig
-sdkconfig.old
\ No newline at end of file
+sdkconfig.old
+
+.local