From 3cb2b2d56e341d971869aa4dce8ed9f8a0e36cfa Mon Sep 17 00:00:00 2001
From: Todd Miller <jmiller@stsci.edu>
Date: Tue, 9 Oct 2018 16:47:47 -0400
Subject: Updated CRDS meta.yaml for version 7.2.6,  not sure about "number".

---
 crds/meta.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'crds')

diff --git a/crds/meta.yaml b/crds/meta.yaml
index 335bcb2..35a88cb 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'crds' %}
-{% set version = '7.2.4' %}
-{% set number = '4' %}
+{% set version = '7.2.6' %}
+{% set number = '0' %}
 
 about:
     home: http://www.stsci.edu/hst/observatory/crds/
@@ -27,10 +27,6 @@ requirements:
     - parsley
     - filelock
     - setuptools
-<<<<<<< HEAD
-    - filelock
-=======
->>>>>>> d75fa7d104a59296efa95bafb7c17b46e7e18dd6
     - python {{ python }}
 
     run:
-- 
cgit