fix merge conflict

desihub · Feb 27, 2018 · 178d60b · 178d60b
1 parent 7202cb1
commit 178d60b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/py/desitarget/io.py b/py/desitarget/io.py
@@ -21,7 +21,7 @@
 #ADM this is a lookup dictionary to map RELEASE to a simpler "North" or "South"
 #ADM photometric system. This will expand with the definition of RELEASE in the
 #ADM Data Model (e.g. https://desi.lbl.gov/trac/wiki/DecamLegacy/DR4sched)
-releasedict = {3000: 'S', 4000: 'N', 5000: 'S'}
+releasedict = {3000: 'S', 4000: 'N', 5000: 'S', 6000: 'N'}
 
 oldtscolumns = [
     'BRICKID', 'BRICKNAME', 'OBJID', 'TYPE',