Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@twz123
twz123 committed Jan 4, 2024
1 parent 137c630 commit f8bfdf3
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/conflicts.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# foo
name: Check for merge conflicts

on:
Expand Down

0 comments on commit f8bfdf3

Please sign in to comment.