Skip to content

Commit

Permalink
Merge main ours (#894)
Browse files Browse the repository at this point in the history 
This is `git merge main -s ours`
  • Loading branch information
@MartinThoma
MartinThoma committed May 24, 2022
1 parent e38b23d commit 3729af0
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3729af0

Please sign in to comment.