Skip to content

Commit

Permalink
merge ignores
Browse files Browse the repository at this point in the history
  • Loading branch information
pmuir committed May 28, 2012
1 parent 9b91bad commit 01fc0ca
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 41 deletions.
37 changes: 27 additions & 10 deletions .gitignore
@@ -1,14 +1,31 @@
.project
.settings/*
!.settings/.jsdtscope
.classpath
*~
target
.DS_Store
.faces-config.xml.faceside
.faces-config.xml.jsfdia
MANIFEST.MF
bin
.openshift
*/.gitignore
.gitkeep
/helloworld-jsp
README.html
CONTRIBUTING.html
.errai
helloworld-gwt/src/main/gwt-unitCache
helloworld-gwt/src/main/webapp/HelloWorldApp
helloworld-gwt/src/main/webapp/WEB-INF/deploy
out
.idea
*.ipr
*.iws
*.iml
*.ipr
.errai
gwt-unitCache
rpcPolicyManifest
src/main/webapp/WEB-INF/deploy/
src/main/webapp/BookingMonitor
atlassian-ide-plugin.xml
.classpath
.project
.settings
.metadata
bin
.nbattrs
*.log
.clover
31 changes: 0 additions & 31 deletions tutorial/.gitignore

This file was deleted.

0 comments on commit 01fc0ca

Please sign in to comment.