tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix merge conflict text in yarn.lock (#977)

This commit is contained in:
Austin Burdine 2018-03-19 18:56:10 -04:00 committed by Kevin Ansfield
parent 6843eb45fc
commit 2c4deefc5b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yarn.lock
View File

@ -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"