Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup conflict diff line from sync to hdf5_1_14 #4677

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Cleanup conflict diff line from sync to hdf5_1_14 #4677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion doxygen/aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
################################################################################
Expand Down
Loading