James Ray

Results 202 comments of James Ray

Okay, thanks. I suppose that's what's also causing the keyboard to not display often as well?

I have no idea, I have spent ages on this now (more than 3 hours in total), and the only difference is that I am adding the license header to...

So I get conflicting files, but I don't get any merge conflicts like [here](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/). ``` ✘ james@james-Streacom  ~/dod   develop  git status On branch develop Your branch...

It's OK I'm making progress with Meld after using `git pull --rebase upstream develop`, many `git rebase --skip`s, `git push origin develop`, `git pull origin develop` and `git mergetool --tool=meld`.

Note that for the Unlicense, you don't need to have a copyright line with the year and authors. I removed that line from my template and some files, while the...