This did not fast-forward merge because I'd made changes to those files since Martin submitted his merge request. This merge brings in the changes contributed in the following two commits from Martin: commit |
||
|---|---|---|
| .. | ||
| index.html | ||
This did not fast-forward merge because I'd made changes to those files since Martin submitted his merge request. This merge brings in the changes contributed in the following two commits from Martin: commit |
||
|---|---|---|
| .. | ||
| index.html | ||