Skip to content

Commit

Permalink
Synch with other projects.
Browse files Browse the repository at this point in the history
  • Loading branch information
markwoon committed Apr 18, 2016
1 parent 47d3167 commit feaa75d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Expand Up @@ -11,6 +11,7 @@
#
# These files are text and should be normalized (convert crlf => lf)
#
.editorconfig text
.gitignore text
.gitattributes text
*.bat text eol=crlf
Expand Down
19 changes: 6 additions & 13 deletions .gitignore
Expand Up @@ -4,28 +4,21 @@
/.idea/gradle.xml
/.idea/modules/
/.idea/modules.xml
/.idea/scssLintPlugin.xml
/.idea/shelf/
/.idea/workspace.xml
/.idea/watcherTasks.xml

# Gradle files
/.gradle/

# Node files
# External tools
.gradle/
/bower_components/
/node_modules/

# Wiki checkout
/*.wiki/

# OS files
# Temporary files
.DS_Store
._.DS_Store

# Temporary files
*~
/build/

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

# for Eclipse
/bin/

0 comments on commit feaa75d

Please sign in to comment.