Update .gitignore

zubialevich · web-flow · commit bae37e73606f · 2024-05-10T09:49:11.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -37,10 +37,5 @@ yarn-error.log*
 # external fonts
 public/fonts/**/Optimistic_*.woff2
 
-<<<<<<< HEAD
-# IntellijIdea files
-.idea
-=======
 # rss
 public/rss.xml
->>>>>>> 556063bdce0ed00f29824bc628f79dac0a4be9f4
