Skip to content
Snippets Groups Projects
Commit 64a7b0c8 authored by Cameron Swords's avatar Cameron Swords :ghost:
Browse files

Merge branch 'cam/union-merge-changelog' into 'main' 

Merge union the changelog file

See merge request !153
parents 461b9e0d 8b12ab2b
No related branches found
No related tags found
1 merge request!153Merge union the changelog file
Pipeline #1550924986 waiting for manual action
Stage: test
Stage: build
Stage: e2e
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitattributes 0 → 100644
+ 1
− 0
View file @ 64a7b0c8
CHANGELOG.md merge=union
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment