solved conflicts

Signed-off-by: Aliwoto <[email protected]>
AnimeKaizoku · Sep 12, 2021 · 52cbf8f · 52cbf8f
2 parents e42c5be + e8fcd66
commit 52cbf8f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 # ignore experimental directories
 woto_files/
-config
+config