From 7b623e964c5bc629e956fb5de7318f831500884e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 15 Sep 2021 22:34:15 -0400
Subject: [PATCH] gitignore fixes

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

diff --git a/.gitignore b/.gitignore
index bab3349708..b7da95d3f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,7 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
+
+# ignored due to frequent branch conflicts.
+core/assets/logicids.dat
+core/assets/icons.icons.properties
\ No newline at end of file