Minor changes

This commit is contained in:
Shank 2011-06-02 02:54:26 -06:00
parent fe998ad677
commit b4e028e103
5 changed files with 34 additions and 41 deletions

12
.gitignore vendored
View file

@ -43,17 +43,9 @@ Thumbs.db
*.suo
*.sdf
*.opensdf
<<<<<<< HEAD
*.csproj.user
=======
>>>>>>> 3ccdba9f51710ccb56e021dd10e53eea3614f21f
*.cache
*.txt
<<<<<<< HEAD
=======
*.pdb
<<<<<<< HEAD
>>>>>>> ef60c83b40be0a7948d3cb0381cc6e4526a9b2d6
=======
*.csproj.user
>>>>>>> 3ccdba9f51710ccb56e021dd10e53eea3614f21f
*/_ReSharper*/*
*.user