Closed constantina-js closed 8 years ago
To remove conflicting files you can just goto my fork and paste the original repo's code to your fork.
Also, I'm also looking into the code to see why it needs 2 clicks to show...
EDIT: How about trying this function instead (https://api.jquery.com/click/)
That's what I did for 404.html before I pushed :/
EDIT: redid copy/paste and when I tried to push it still told me that everything was up to date and nothing needed to be push
Can you click "Use the command line" to merge the conflicts? I would love to merge the dictionary styled page but I can't without the conflicts being resolved first.
EDIT: I figured it out, it was merge conflict for README.md
Preview can be found:
https://conscou.github.io/afullstop/pages/dictionaryDefinition.html