From ea1c4e6494ad20bef01c239ebdd6b3ab7a88a2b4 Mon Sep 17 00:00:00 2001 From: Austin Burdine Date: Mon, 19 Mar 2018 18:56:10 -0400 Subject: [PATCH] Fix merge conflict text in yarn.lock (#977) --- ghost/admin/yarn.lock | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 36c29bac24..f5a929e9d2 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -6070,18 +6070,6 @@ just-extend@^1.1.27: version "1.1.27" resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905" -<<<<<<< HEAD -======= -jxLoader@*: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jxLoader/-/jxLoader-0.1.1.tgz#0134ea5144e533b594fc1ff25ff194e235c53ecd" - dependencies: - js-yaml "0.3.x" - moo-server "1.3.x" - promised-io "*" - walker "1.x" - ->>>>>>> 🔥 Remove bower & unused bower dependencies keymaster@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb"