.gitignore.orig

<<<<<<< HEAD
[Oo]bj/
[Bb]in/
*.user
*.suo
*.[Cc]ache
*.bak
*.ncb
*.log 
*.DS_Store
[Tt]humbs.db
*.pdb
*.exe
*.manifest
*.msi
_ReSharper.*
lib/
AddIns/
AddInViews/
AddInSideAdapters/
HostSideAdapters/
OSAE.API.dll
=======
*.suo
*.user
_ReSharper.*
bin
obj
/output/lib

# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs     diff=csharp
*.sln    merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc  diff=astextplain
*.DOC  diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot  diff=astextplain
*.DOT  diff=astextplain
*.pdf  diff=astextplain
*.PDF  diff=astextplain
*.rtf  diff=astextplain
*.RTF  diff=astextplain
>>>>>>> matthewste/master