search

SoftInstigate / restheart-website

restheart.org main website
https://restheart.org
5 stars 25 forks source link

new design #4

Closed romanu417 closed 6 years ago

mkjsix commented 6 years ago

Hi @romanu417 Meanwhile we also have modified the source code, you should pull from master and then rebase you changes to master, otherwise there are conflicts we cannot resolve. I hope you can do that from you local branch with a single git pull --rebase

romanu417 commented 6 years ago

I applied git pull --rebase All done correctly?

mkjsix commented 6 years ago

@romanu417 I cannot see any new PR here, did you push the changes?