Joao Fernandes f1102790e2 Remove merge conflict metadata from UCP docs

2016-11-02 11:41:48 -07:00

..

backup.md

Merge branch '1.1-docs' of ../orca/ into ucp-1.1

2016-11-01 18:38:19 -07:00

dump-certs.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

engine-discovery.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

fingerprint.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

help.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

id.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

images.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

index.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

install.md

Merge branch '1.1-docs' of ../orca/ into ucp-1.1

2016-11-01 18:38:19 -07:00

join.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

regen-certs.md

Remove merge conflict metadata from UCP docs

2016-11-02 11:41:48 -07:00

restart.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

restore.md

Merge branch '1.1-docs' of ../orca/ into ucp-1.1

2016-11-01 18:38:19 -07:00

stop.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

support.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

uninstall.md

Move docs to ucp/

2016-11-01 17:18:37 -07:00

upgrade.md

Merge branch '1.1-docs' of ../orca/ into ucp-1.1

2016-11-01 18:38:19 -07:00