search

TheNerdyFeline / marvel-app

Herolution
0 stars 3 forks source link

merge conflict with regheros #24

Closed TheNerdyFeline closed 7 years ago

TheNerdyFeline commented 7 years ago

it looks like you need to pull all the current stuff before you can merge your new stuff, it looks like just something you need to do through the command line, ill connect the merge conflict with this issue and see if that allows you to see the problem