search

prophecymud / mud.prophecy.lu

Prophecy's website
http://mud.prophecy.lu/
0 stars 2 forks source link

Add files via upload #15

Open prophecythemud opened 4 years ago

prophecythemud commented 4 years ago

Two file changes, use (or not) per your own preference:

index.markdown - I removed the site description code and added my own content. about.markdown - Content in a separate file (for later consideration or simply to place elsewhere, such as in an "About" directory.

No themes involved, they should work pretty much as-is unless I botched the Jekyll markup. Cheers.

anhegofcherek commented 4 years ago

Thanks! Would you be able to resolve the conflicts or would you like me to have a go?

prophecyweb commented 4 years ago

I didn't have Jekyll installed when I worked on those markdown pages. I do now; it appears to be running ok on Windows. It's slightly different than working with Hugo, but it shouldn't be too hard to learn. What specific conflicts are you seeing? Is there a way for me to see them? Thanks!

anhegofcherek commented 4 years ago

Cheers :) Have you seen e.g. https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github?