Delete leftover conflict line. (#4677)

HDFGroup · Jul 29, 2024 · 7293c1e · 7293c1e
1 parent da7f0f7
commit 7293c1e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/doxygen/aliases b/doxygen/aliases
@@ -23,7 +23,6 @@ ALIASES += SRCURL="github.com/HDFGroup/hdf5/blob/hdf5_1_14"
 ALIASES += PRJURL="\HDFURL/projects"
 ALIASES += HVURL="github.com/HDFGroup/hdfview/blob/master"
 ALIASES += PLURL="github.com/HDFGroup/hdf5_plugins/blob/master"
->>>>>>> e716059... Update doxygen Learn Basics / example refs. Add Reference sections (#4640)
 ################################################################################
 # Styling
 ################################################################################