Menu
▾
▴
Tree [ca314a] PUB-test1 / History
| File | Date | Author | Commit |
|---|---|---|---|
| README | 2015-01-04 |
Derek
|
[bde11d] et fini. |
| foo | 2016-02-12 |
keni
|
[ca314a] meaningless change to force this branch to SF |
| pubreadme | 2015-01-30 |
keni
|
[386dd1] add a public file to the public branch |
Read Me
someday there will be something useful to say here testing, testing. 1 lines added in master... ...in branch... //<<<<<<< HEAD //...while feature branch outside //...to create conflicts... //======= //...in feature branch //...which will conflict with other branch //>>>>>>> derekfeature leaving conflict in place but nudged aside for reference and finally tacking this on the end
