Skip to content

Commit 364a0bf

Browse files
author
Amir Tocker
committed
Merge branch 'angular_next' of https://github.com/cloudinary/cloudinary_angular into angular_next
2 parents 88b8638 + 50a0c8d commit 364a0bf

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.editorconfig

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
# http://editorconfig.org
2+
13
root = true
24

35
[*]
46
charset = utf-8
57
indent_style = space
6-
indent_size = 4
8+
indent_size = 2
9+
end_of_line = lf
710
insert_final_newline = true
8-
trim_trailing_whitespace = true
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
insert_final_newline = false
15+
trim_trailing_whitespace = false

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ os:
1212
# - CHROME_BIN=chromium-browser
1313
# before_script:
1414
# - sh -e /etc/init.d/xvfb start
15-
install:
16-
- npm install
1715
script:
1816
- npm run lint
1917
- npm run test-once

0 commit comments

Comments
 (0)