fix merge conflict

biolink · Mar 4, 2024 · eb41b70 · eb41b70
1 parent 25741c4
commit eb41b70
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -93,7 +93,6 @@ and a new gh-pages documentation layout.
 * @glass-ships made their first contribution in https://github.com/biolink/biolink-model/pull/1404
 
 **Full Changelog**: https://github.com/biolink/biolink-model/compare/v3.5.4...v3.6.0
->>>>>>> master
 
 3.5.4
 -----