fix conflicts with master

lsst-camera-dh · Sep 4, 2018 · a653fa2 · a653fa2
2 parents 9bf7771 + 87eb681
commit a653fa2
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/packageLists/IR2_JH_versions.txt b/packageLists/IR2_JH_versions.txt
@@ -23,4 +23,3 @@ stack_dir = /lsst/dh/software/centos7-gcc48/anaconda/py-2.7/envs/v12_0
 [datacat]
 datacatdir = /lsst/dh/software/centos7-gcc48/dev/datacat/0.4
 datacat_config = /lsst/dh/software/centos7-gcc48/dev/datacat/config.cfg
-