Skip to content

Commit 47c2dc0

Browse files
committed
Merge branch 'master' into dev
2 parents d0abd77 + be7a122 commit 47c2dc0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# JavaScript Design Patterns
22

3-
[![Build Status](https://travis-ci.org/zoltantothcom/JavaScript-Design-Patterns.svg?branch=master)](https://travis-ci.org/zoltantothcom/JavaScript-Design-Patterns) [![Coverage Status](https://coveralls.io/repos/github/zoltantothcom/JavaScript-Design-Patterns/badge.svg)](https://coveralls.io/github/zoltantothcom/JavaScript-Design-Patterns)
3+
[![Build Status](https://travis-ci.org/zoltantothcom/JavaScript-Design-Patterns.svg?branch=master)](https://travis-ci.org/zoltantothcom/JavaScript-Design-Patterns) [![Coverage Status](https://coveralls.io/repos/github/zoltantothcom/JavaScript-Design-Patterns/badge.svg)](https://coveralls.io/github/zoltantothcom/JavaScript-Design-Patterns) [![Greenkeeper badge](https://badges.greenkeeper.io/zoltantothcom/JavaScript-Design-Patterns.svg)](https://greenkeeper.io/)
44

55
JavaScript Design Patterns - a game to get familiar with the design patterns, test your knowledge or simply for fun.
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"html-webpack-plugin": "^3.2.0",
6767
"jest": "^24.0.0",
6868
"jest-styled-components": "^6.3.1",
69-
"prettier": "1.16.2",
69+
"prettier": "1.16.4",
7070
"react-test-renderer": "^16.7.0",
7171
"redux-mock-store": "^1.5.3",
7272
"storybook-addon-styled-component-theme": "^1.1.1",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8577,10 +8577,10 @@ prelude-ls@~1.1.2:
85778577
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
85788578
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
85798579

8580-
prettier@1.16.2:
8581-
version "1.16.2"
8582-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.2.tgz#f60bc5929a7f9a05260cc88d5430391100092414"
8583-
integrity sha512-vBMdCn1LjrFi2CpBsiWVKOq+WP9poXDTIGPe2sG3eE33LQ3b6IUgmaMjLZKKY+frD/8FqPeEK1qAx9mOV8iruA==
8580+
prettier@1.16.4:
8581+
version "1.16.4"
8582+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
8583+
integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
85848584

85858585
pretty-error@^2.0.2, pretty-error@^2.1.1:
85868586
version "2.1.1"

0 commit comments

Comments
 (0)