🍺 Beer-first mobile search app built with Hapi and Chaplin
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 

81 lines
934 B

<<<<<<< HEAD
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
# Logs and databases #
######################
*.log
*.sql
*.sqlite
# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
# NPM packages folder.
node_modules/
# Bower stuff.
bower_components/
=======
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache
*.sublime*
*.iws
# OS or Editor folders
.DS_Store
.cache
.project
.settings
.tmproj
nbproject
Thumbs.db
# WebStorm / IntelliJ
.idea/tasks.xml
.idea/watcherTasks.xml
.idea/workspace.xml
# Project specific
npm-debug.log
node_modules/
tmp/
public/
bower_components/
>>>>>>> upstream/master