diff --git a/.gitignore b/.gitignore index 31e0c50..8389a4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ /build/ /install/ /log/ -<<<<<<< HEAD -/.idea/ -======= -.idea ->>>>>>> origin/main +.idea/ +