From cfa6fd3aa685a5fdcd7f32b9cc787772e0c575db Mon Sep 17 00:00:00 2001
From: ivaosthu <ivar.conradi.osthus@finn.no>
Date: Thu, 22 Nov 2018 09:08:52 +0100
Subject: [PATCH] chore: Upgrade prettier to 1.15.2

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

diff --git a/package.json b/package.json
index fa37e50cc7..b9d82d24b1 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "lint-staged": "^8.0.0",
     "lolex": "^3.0.0",
     "nyc": "^13.1.0",
-    "prettier": "^1.14.3",
+    "prettier": "^1.15.2",
     "proxyquire": "^2.0.1",
     "superagent": "^4.0.0",
     "supertest": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index ef5c9d341a..e0983867b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5516,10 +5516,10 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@^1.14.3:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
-  integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
+prettier@^1.15.2:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"
+  integrity sha512-YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug==
 
 pretty-format@^23.6.0:
   version "23.6.0"