[SCM] PostGIS branch stable-3.3 updated. 3.3.7-45-gdc1065b14

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.3 has been updated
       via  dc1065b14c105f3acff1ea0b67a2c2f938e105f8 (commit)
      from  de2e2c580468de50b3bd984ccd1df6834303a2db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc1065b14c105f3acff1ea0b67a2c2f938e105f8
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Jul 19 14:31:17 2025 +0200

    Drop conflict marks

diff --git a/topology/test/regress/topogeo_addpoint_expected b/topology/test/regress/topogeo_addpoint_expected
index 787fd746c..b4aa3f69f 100644
--- a/topology/test/regress/topogeo_addpoint_expected
+++ b/topology/test/regress/topogeo_addpoint_expected
@@ -32,8 +32,5 @@ tt5394|E2|2
 tt5394|N|3
 t5698|E|1
 t5698|N|3
-<<<<<<< HEAD
-=======
 t5794|N|3
 ERROR:  Corrupted topology: geometry of edge 1 is EMPTY
->>>>>>> 39304ca29 (Have GetFaceContainingPoint catch EMPTY edges in corrupted topology)

-----------------------------------------------------------------------

Summary of changes:
 topology/test/regress/topogeo_addpoint_expected | 3 ---
 1 file changed, 3 deletions(-)


hooks/post-receive
-- 
PostGIS