BitTim
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 12 deletions b/‎.gitignore‎
Lines changed: 2 additions & 12 deletions
diff --git a/‎Linux/.cache/10.png‎
707 KB b/‎Linux/.cache/10.png‎
707 KB
diff --git a/‎Linux/.cache/11.png‎
686 KB b/‎Linux/.cache/11.png‎
686 KB
diff --git a/‎Linux/.cache/12.png‎
264 KB b/‎Linux/.cache/12.png‎
264 KB
diff --git a/‎Linux/.cache/2.png‎
875 KB b/‎Linux/.cache/2.png‎
875 KB
diff --git a/‎Linux/.cache/3.png‎
748 KB b/‎Linux/.cache/3.png‎
748 KB
diff --git a/‎Linux/.cache/4.png‎
689 KB b/‎Linux/.cache/4.png‎
689 KB
diff --git a/‎Linux/.cache/5.png‎
646 KB b/‎Linux/.cache/5.png‎
646 KB
diff --git a/‎Linux/.cache/6.png‎
702 KB b/‎Linux/.cache/6.png‎
702 KB
diff --git a/‎Linux/.cache/7.png‎
726 KB b/‎Linux/.cache/7.png‎
726 KB
@@ -32,19 +32,9 @@
 *.app
 
 # Cached files
-.cache
-<<<<<<< HEAD
-cache
+.makeCache
+.cache/*
 build
 
 # Binaries
 bitPresent
-
-# VSCode
-.vscode
-=======
-build
-
-# Binaries
-bitPresent
->>>>>>> gui