Skip to content

Commit

Permalink
Merge pull request #11 from zumba/editorconfig
Browse files Browse the repository at this point in the history
Adding .editorconfig and making whitespace consistent
  • Loading branch information
young-steveo committed Dec 4, 2015
2 parents cff024c + ff16a34 commit 49bfb4e
Show file tree
Hide file tree
Showing 21 changed files with 437 additions and 419 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# editorconfig.org
root = true

[*]
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.json]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-waypoints",
"version": "1.0.1",
"version": "1.0.2",
"description": "An AngularJS module for working with jQuery Waypoints",
"main": "dist/angular-waypoints.js",
"license": "MIT",
Expand Down
284 changes: 143 additions & 141 deletions dist/angular-waypoints.all.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/angular-waypoints.all.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 49bfb4e

Please sign in to comment.