Fix merge confict

Merge branch 'master' of code.usgs.gov:water/EGRET # Conflicts: # code.json
DOI-USGS · Aug 8, 2018 · ad9d5c6 · ad9d5c6
2 parents f9d66ad + 107bbf4
commit ad9d5c6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/code.json b/code.json
@@ -42,4 +42,3 @@
     }
   }
 ]
-