diff --git a/.gitignore b/.gitignore
index 025d915..cccde2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ uploads/
 docker-compose*.yml
 !docker-compose.example.yml
 config*.toml
->>>>>>> dev