diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 21a07b8c040..b172c446553 100644 --- a/.gitignore +++ b/.gitignore @@ -11,10 +11,6 @@ __pycache__/ *.swo *# -# conflicts -*.orig -*.rej - # QtCreator CMakeLists.txt.user |