From 86e54b59187f8da4b08296e03ad57b9c7b6a96e7 Mon Sep 17 00:00:00 2001
From: MeowFack <49147560+MeowFack@users.noreply.github.com>
Date: Tue, 24 Sep 2019 13:08:03 +0300
Subject: [PATCH] Merge remote-tracking branch 'upstream/renovate/prettier-1.x'
 into bgg

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 22ed060..85f667b 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@types/request": "2.48.2",
     "jest": "24.9.0",
     "jest-playback": "2.0.2",
-    "prettier": "1.17.0",
+    "prettier": "1.18.2",
     "tslint": "5.19.0",
     "tslint-plugin-prettier": "2.0.1",
     "typescript": "3.6.2"
diff --git a/yarn.lock b/yarn.lock
index 7f48641..db90c6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3023,10 +3023,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier@1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008"
-  integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==
+prettier@1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
 pretty-format@^24.9.0:
   version "24.9.0"