Skip to content

Commit

Permalink
chore: removed merge conflict file
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfmcquade
jfmcquade committed Oct 3, 2024
1 parent 7028129 commit afb5df5
Showing 1 changed file with 0 additions and 170 deletions.
170 changes: 0 additions & 170 deletions config.json~3eea9e6... correct merge conflict
View file

This file was deleted.

0 comments on commit afb5df5

Please sign in to comment.