diff --git a/.gitignore b/.gitignore index 38eeab44b65..750cd37ddd2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ assets/* /sounds /videos +# Merge tool left over files +*.orig + # Website directory website/*