diff --git a/.gitignore b/.gitignore index d87d4be..7d6a7e4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ spec/reports test/tmp test/version_tmp tmp +.mergeq