From ecc876752a188d7a5420abd1eececa587bdf7d6b Mon Sep 17 00:00:00 2001
From: Daniel Evans <daniel.fred.evans@gmail.com>
Date: Mon, 13 Dec 2021 16:40:34 +0000
Subject: Remove git stash holdover in news.rst

---
 docs/source/news.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/source/news.rst b/docs/source/news.rst
index 7a6503cb..cad77ea3 100644
--- a/docs/source/news.rst
+++ b/docs/source/news.rst
@@ -292,8 +292,6 @@ Bug fixes
 * :c:func:`createOperations()`: fix incorrect height transformation between 3D promoted RGF93 and CH1903+ (`#2555 <https://github.com/OSGeo/PROJ/issues/2555>`_)
 
 
-
->>>>>>> Stashed changes
 8.0.0 Release Notes
 ++++++++++++++++++++++++++++++++++++++++
 *March 1st 2021*
-- 
cgit v1.2.3