<<<<<<< HEAD
<<<<<<< HEAD
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
=======
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

=======
*.class

>>>>>>> b2c168fe1f80b7004ffcb62a59826201d562d638
# Package Files #
*.jar
*.war
*.ear
<<<<<<< HEAD

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
>>>>>>> 51e4f0fcdacfc032b33e0c442643edae9bb0a0b3
=======
>>>>>>> b2c168fe1f80b7004ffcb62a59826201d562d638