diff --git a/.gitignore b/.gitignore index 4b4e8ae..610dd86 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ backup/* deb/* .remote-sync.json +*.sync-conflict-*