code:remixeddungeon:src:main:java:com:watabou:pixeldungeon:actors:mobs:npcs:shopkeeper.java

Old Revisions

These are the older revisons of the current document. To revert to an old revision, select it from below, click Edit this page and save it.

Exception: Git command failed to perform periodic pull: error: Your local changes to the following files would be overwritten by merge: pages/rpd/armor.txt Please commit your changes or stash them before you merge. Aborting

Exception: Git command failed to perform periodic pull: error: Your local changes to the following files would be overwritten by merge: pages/rpd/armor.txt Please commit your changes or stash them before you merge. Aborting

An unforeseen error has occured. This is most likely a bug somewhere. It might be a problem in the gitbacked plugin.

More info has been written to the DokuWiki error log.