fix release table

spacetelescope · Feb 3, 2022 · 8717fba · 8717fba
1 parent 2a6068f
commit 8717fba
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -188,12 +188,8 @@ contact the [JWST Help Desk](https://jwsthelp.stsci.edu).
 
 | jwst tag | DMS build | CRDS_CONTEXT |   Date     |          Notes                                |
 | -------- | --------- | ------------ | ---------- | ----------------------------------------------|
-<<<<<<< HEAD
-|  1.4.2   | B7.9      | 0797         | 2022-01-20 | Third release candidate for B7.9              |
-=======
-|  1.4.3   | B7.9.1    | 0800         | 2022-02-03 | Final B7.9.1                                  |
+|  1.4.3   | B7.9.1    | 0797         | 2022-02-03 | Final B7.9.1                                  |
 |  1.4.2   | B7.9      | 0797         | 2022-01-20 | Final release candidate for B7.9              |
->>>>>>> 2c85acb6... prepare 1.4.3 changelog (#6712)
 |  1.4.1   | B7.9rc2   | 0786*        | 2022-01-15 | Second release candidate for B7.9             |
 |  1.4.0   | B7.9rc1   | 0786*        | 2022-01-10 | First release candidate for B7.9              |
 |  1.3.3   | B7.8.2    | 0764         | 2021-10-05 | Same as 1.3.2, but with installation bug fix  |