.gitignore

<<<<<<< .merge_file_a07836
# Created by https://www.gitignore.io

### Unity ###
=======
>>>>>>> .merge_file_a07808
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/

# Autogenerated VS/MD solution and project files
<<<<<<< .merge_file_a07836
*.csproj
*.unityproj
*.sln
*.suo
*.user
*.userprefs
*.pidb
*.booproj

# Unity3D Generated File On Crash Reports
sysinfo.txt
=======
/*.csproj
/*.unityproj
/*.sln
/*.suo
/*.user
/*.userprefs
/*.pidb
/*.booproj

#Unity3D Generated File On Crash Reports
sysinfo.txt
JamSiders/Assembly-CSharp-firstpass-vs.csproj
JamSiders/Assembly-CSharp-firstpass.csproj
JamSiders/Assembly-CSharp-vs.csproj
JamSiders/Assembly-CSharp.csproj
JamSiders/Assembly-UnityScript-Editor-vs.unityproj
JamSiders/Assembly-UnityScript-Editor.unityproj
JamSiders/Assembly-UnityScript-firstpass-vs.unityproj
JamSiders/Assembly-UnityScript-firstpass.unityproj
JamSiders/JamSiders-csharp.sln
JamSiders/JamSiders.sln
>>>>>>> .merge_file_a07808