aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-12-14 15:07:01 +1300
committerGitHub <noreply@github.com>2021-12-14 15:07:01 +1300
commit0845df60254221e084cf76a894d9d87067ec29ed (patch)
tree6f217af1ed87d5430430246b4ba180b4249db6f7
parent587d80536d1cabc70edeb19dbedf46974370b5eb (diff)
downloadPROJ-0845df60254221e084cf76a894d9d87067ec29ed.tar.gz
PROJ-0845df60254221e084cf76a894d9d87067ec29ed.zip
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>
-rw-r--r--docs/source/news.rst2
1 files changed, 0 insertions, 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*