search

TalliLlani / demo-project

0 stars 0 forks source link

New gallery page #28

Closed mrlukemackenzie closed 6 years ago

mrlukemackenzie commented 6 years ago

Trying to merge latest updates.

mrlukemackenzie commented 6 years ago

It says there is a conflict again. Looks like you are going to have to merge the latest updates from the 'new-gallery-page' branch into 'master' via atom.