From b867a1e6cd5eb02f41091f5ebcd4ee886bfe9d0b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 10 Oct 2022 12:47:02 -0500 Subject: [PATCH] [doc] fixing release notes include 3.3.5 --- NEWS | 4 ---- doc/src/release_notes.rst | 4 ---- 2 files changed, 8 deletions(-) diff --git a/NEWS b/NEWS index 2d5e120ec91..ca6390e2b69 100644 --- 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 index 8df68887466..6b08d2f990c 100644 --- 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 `__: 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 -------------------------------------------------------------------------------