From 0845df60254221e084cf76a894d9d87067ec29ed Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:07:01 +1300
Subject: Merge pull request #2982 from DFEvans/patch-1 (#2984)

Remove git stash holdover in news.rst

Co-authored-by: Even Rouault <even.rouault@spatialys.com>
---
 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