1. Oliver Smith
  2. tradedangerous
  3. Pull requests

Pull requests

#144 Open
Repository
kfsone
Branch
master

Updated Item.csv with new items which were breaking my imports.

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

git checkout master
git remote add bdebic/tradedangerous https://bitbucket.org/bdebic/tradedangerous.git
git fetch bdebic/tradedangerous
git merge --no-ff -m 'Merged in bdebic/tradedangerous/bdebic/updated-itemcsv-with-new-items-which-wer-1487297627721 (pull request #144)' remotes/bdebic/tradedangerous/bdebic/updated-itemcsv-with-new-items-which-wer-1487297627721
Author
  1. BD
Reviewers
Description

Updated Item.csv with new items which were breaking my imports.

Comments (1)

  1. BD author

    Given the change to Item.csv in the following pull request I think you folks can safely ignore mine. Perhaps a quick check if any item is missing in that pull request would be prudent. Leaving the pull request up if anyone else needs this format before the new one is introduced.