fixed conflict on merge

This commit is contained in:
Scott Charlton 2020-01-27 16:52:46 -07:00
commit bb5bcbf15e
2 changed files with 2 additions and 0 deletions

View File

@ -1,5 +1,6 @@
#
# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src
# SRC 2020-01-27T14:33:39-07:00
#
image: buildpack-deps:bionic-scm

View File

@ -1,5 +1,6 @@
#
# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src-common
# SRC 2020-01-27T14:33:39-07:00
#
image: buildpack-deps:bionic-scm