tpage
2018-05-29 cf3b1cc69945e0d2a7e35f84037d7f8974c902fd
refs
author tpage <tpage@redhat.com>
Tuesday, May 29, 2018 16:09 +0200
committer tpage <tpage@redhat.com>
Tuesday, May 29, 2018 16:09 +0200
commitcf3b1cc69945e0d2a7e35f84037d7f8974c902fd
tree 256557fc769c9669100fd725c525dc92f861bf79 tree | zip | gz
parent fd96bdef35f9d6eb63d7ec304c5389e9b1c0a262 view | diff
4c8a9b67155ad2d07d1678d0cd17a65ab6037a52 view | diff
Fixed merge conflicts
8 files modified
268 ■■■■ changed files
1-the-manual-menace/README.md 88 ●●●● diff | view | raw | blame | history
2-attack-of-the-pipelines/README.md 42 ●●●● diff | view | raw | blame | history
3-revenge-of-the-automated-testing/README.md 42 ●●●● diff | view | raw | blame | history
4-an-enslaved-hope/README.md 52 ●●●● diff | view | raw | blame | history
5-non-functionals-strike-back/README.md 28 ●●●● diff | view | raw | blame | history
6-return-of-the-app-monitoring/README.md 2 ●●● diff | view | raw | blame | history
7-the-cluster-awakens/README.md 6 ●●●● diff | view | raw | blame | history
8-the-last-unicorn-dev/README.md 8 ●●●● diff | view | raw | blame | history