From e3ccb95b25b6a978e8e2da7783cc53ec6b2d698a Mon Sep 17 00:00:00 2001
From: Todd Miller <jmiller@stsci.edu>
Date: Fri, 22 Jun 2018 09:06:26 -0400
Subject: Updated version CRDS version to 7.2.4 corresponding to JWST DMS
 B7.1.3. Changed dependency on lockfile to filelock since lockfile is
 deprecated.

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

diff --git a/crds/meta.yaml b/crds/meta.yaml
index 8d98405..b91a9b2 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = 'crds' %}
-{% set version = '7.1.5' %}
+{% set version = '7.2.4' %}
 {% set number = '4' %}
 
 about:
@@ -26,7 +26,7 @@ requirements:
     - lxml
     - parsley
     - setuptools
-    - lockfile
+    - filelock
     - python {{ python }}
 
     run:
@@ -37,7 +37,7 @@ requirements:
     - lxml
     - fitsverify
     - parsley
-    - lockfile
+    - filelock
     - python
 
 source:
-- 
cgit 


From 8094d398972ad8b826de61a71d38b94e6c252621 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@users.noreply.github.com>
Date: Fri, 22 Jun 2018 11:22:05 -0400
Subject: Reset build number

---
 crds/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crds/meta.yaml b/crds/meta.yaml
index b91a9b2..117b7e7 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 number = '0' %}
 
 about:
     home: http://www.stsci.edu/hst/observatory/crds/
-- 
cgit 


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(-)

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