Update .gitignore

zubialevich · web-flow · commit 17234c40a486 · 2024-05-10T08:58:29.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -37,10 +37,8 @@ yarn-error.log*
 # external fonts
 public/fonts/**/Optimistic_*.woff2
 
-<<<<<<< HEAD
+
 # IntellijIdea files
 .idea
-=======
 # rss
 public/rss.xml
->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
