Skip to content

Commit

Permalink
Add sample conflicts file
Browse files Browse the repository at this point in the history 
This is already referenced in the manual.
  • Loading branch information
@Wilfred
Wilfred committed May 14, 2024
1 parent a259c85 commit a9bcee7
Showing 1 changed file with 1,711 additions and 0 deletions.
Loading

0 comments on commit a9bcee7

Please sign in to comment.