diff --git a/.gitignore b/.gitignore index cf68923974357135452e0578c596db28278d9aeb..86849c6cc1edeb1c6a8b9b8f0d76d73068635104 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,3 @@ DerivedData DerivedData.noindex *.xcuserstate *.swp ->>>>>>> master