[doc] fixing release notes include 3.3.5

pgRouting · Oct 11, 2022 · b867a1e · b867a1e
1 parent 6c6e16e
commit b867a1e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/NEWS b/NEWS
@@ -92,12 +92,8 @@ milestone for 3.4.0
 pgRouting 3.3.5 Release Notes
 -------------------------------------------------------------------------------
 
-<<<<<<< HEAD
 * [#2401](https://github.com/pgRouting/pgrouting/issues/2401):
   pgRouting 3.4.0 do not build docs when sphinx is too low or missing
-=======
-No Changes Yet
->>>>>>> 0091d7e747... [update] include 3.3.5
 
 pgRouting 3.3.4 Release Notes
 -------------------------------------------------------------------------------

diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
@@ -130,12 +130,8 @@ milestone for 3.4.0
 pgRouting 3.3.5 Release Notes
 -------------------------------------------------------------------------------
 
-<<<<<<< HEAD
 * `#2401 <https://github.com/pgRouting/pgrouting/issues/2401>`__:
   pgRouting 3.4.0 do not build docs when sphinx is too low or missing
-=======
-No Changes Yet
->>>>>>> 0091d7e747... [update] include 3.3.5
 
 pgRouting 3.3.4 Release Notes
 -------------------------------------------------------------------------------