Fixed the conflicts

2016-08-04 21:28:38 -04:00
parent 55c944b83b
commit 601b9276f0
1 changed files with 6 additions and 2 deletions
@@ -1,4 +1,8 @@
 ---
 assignees:
 - eparis
 - pmorie
 ---
 Many applications require configuration via some combination of config files, command line
 arguments, and environment variables.  These configuration artifacts should be decoupled from image