aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-12-13 19:37:49 +0100
committerGitHub <noreply@github.com>2021-12-13 19:37:49 +0100
commit2072894385205dc9e24aa86ad3da820391f5f002 (patch)
treecc558cb547ed5bf89508cc062b53bbc041e74905 /docs
parent971882ef2d21a0ad36561c23f79db11baa33d494 (diff)
parentecc876752a188d7a5420abd1eececa587bdf7d6b (diff)
downloadPROJ-2072894385205dc9e24aa86ad3da820391f5f002.tar.gz
PROJ-2072894385205dc9e24aa86ad3da820391f5f002.zip
Merge pull request #2982 from DFEvans/patch-1
Remove git stash holdover in news.rst
Diffstat (limited to 'docs')
-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*