Maria Bermudez 06d00cc3bd Remove merge conflict

2019-04-01 12:02:31 -07:00

..

couchbase

…

mongodb

…

apt-cacher-ng.Dockerfile

…

apt-cacher-ng.md

Favor docker <object> <verb> format of commands (#5914)

2018-02-05 09:33:47 -08:00

couchdb_data_volumes.md

Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)

2018-01-25 17:37:23 -08:00

dotnetcore.md

Update dotnetcore.md

2019-01-11 13:06:21 -05:00

index.md

Removing old links

2017-08-16 18:15:36 -07:00

postgresql_service.Dockerfile

…

postgresql_service.md

Update postgresql_service.md

2018-09-04 11:08:36 +08:00

running_riak_service.Dockerfile

…

running_riak_service.md

Update running_riak_service.md

2018-09-04 14:08:30 +08:00

running_ssh_service.Dockerfile

PermitRootLogin sed (#4822)

2017-10-10 11:14:58 -07:00

running_ssh_service.md

Remove merge conflict

2019-04-01 12:02:31 -07:00

supervisord.conf

…