themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge or some shit

Browse source
This commit is contained in:
Maverick Motherfucker 2011-05-30 02:00:36 -07:00
commit 9006ffbd96
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

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