search

SoftInstigate / restheart-website

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

new design #5

Closed romanu417 closed 6 years ago

mkjsix commented 6 years ago

@romanu417 I'll try to resolve the conflicts myself, strange because you should see conflicts on your side also

mkjsix commented 6 years ago

Actually I see too many conflicts. Does the site runs for you locally?

romanu417 commented 6 years ago

Yes, it works

mkjsix commented 6 years ago

It means you didn't merge your local copy with the updated master, otherwise you must see exactly the same conflicts as you can see in this PR

romanu417 commented 6 years ago

All is well done?

mkjsix commented 6 years ago

@romanu417 yes thanks, merge is successful, we are reviewing the site locally. We'll go back to you with comments as soon as possible.