Skip to content

Commit

Permalink
reconcile - fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@EJMFarrow
EJMFarrow committed Mar 5, 2024
2 parents de41fc4 + 4a7664e commit 981b220
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/cli/config.php
/cli/config.php

0 comments on commit 981b220

Please sign in to comment.