fixed conflict res

jaymedina · jaymedina · commit 44611e113c7c · 2023-04-06T09:43:49.000-04:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -154,7 +154,6 @@ nist
 
 - Vectoized ``linename`` option to query multiple spectral lines with one call
   of ``Nist.query``. [#2678]
-  ``TesscutClass``. [#2668]
 
 oac
 ^^^
