From 37b9cccc9c3cd1e6436156f1dd0991549a6e4648 Mon Sep 17 00:00:00 2001
From: Lynnesbian <lynne@bune.city>
Date: Sat, 2 Oct 2021 19:25:35 +1000
Subject: [PATCH] update gitignore

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

diff --git a/.gitignore b/.gitignore
index f5859dd..eac6fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ todo.txt
 /packages
 /fif
 /fif.exe
+.idea/workspace.xml
+*.sync-conflict*
\ No newline at end of file