search

HoeenCoder / Wavelength

The github repository for the Wavelength server on Pokemon Showdown.
http://wavelength.psim.us/
Other
10 stars 46 forks source link

Add: Economy & nef #241

Closed Dragotic-PS closed 5 years ago

Dragotic-PS commented 5 years ago

this was merge conflict hell

TravisBuddy commented 5 years ago

Hey @Dragotic-PS, Something went wrong with the build.

TravisCI finished with status errored, which means the build failed because of something unrelated to the tests, such as a problem with a dependency or the build process itself.

View build log

TravisBuddy Request Identifier: 5335e570-56f8-11e9-979a-6d93f48c24a0
HoeenCoder commented 5 years ago

Not sure what happened here to cause this, but what I would do is make your edits on a copy of the refactor branch 

git fetch origin
git checkout -b newBranch refactor

Maybe you made your refactor branch based off of master?

Dragotic-PS commented 5 years ago

too many conflicts, i'll have to rebase, closing this PR