Created
December 14, 2016 05:10
-
-
Save anonymous/b4bb3594f1488a4e07f2d801a9f8fa87 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
C:\Users\AmazeCPK\WebstormProjects\edm-sweep>git pull | |
Updating 483a82d..09dd792 | |
error: The following untracked working tree files would be overwritten by merge: | |
npm-debug.log | |
public/images/uploads/contests/1481611041751.png | |
public/images/uploads/contests/1481611255020.png | |
public/images/uploads/contests/1481611330491.png | |
public/images/uploads/contests/1481612254130.png | |
public/images/uploads/contests/1481613815800.png | |
public/images/uploads/contests/1481613897752.png | |
public/images/uploads/contests/1481613926160.png | |
public/images/uploads/contests/1481617809429.png | |
public/images/uploads/contests/1481618313180.png | |
public/images/uploads/contests/1481645444296.png | |
public/images/uploads/contests/1481676482695.png | |
public/images/uploads/contests/1481676693454.png | |
public/images/uploads/contests/1481676865553.png | |
public/images/uploads/contests/1481676957809.png | |
public/images/uploads/contests/1481677109164.png | |
public/images/uploads/contests/1481677187144.png | |
public/images/uploads/contests/1481678789447.png | |
routes/admin.js.save | |
routes/admin.js.save.1 | |
Please move or remove them before you merge. | |
Aborting |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment