Skip to content

Commit

Permalink
remove stray conflict line
Browse files Browse the repository at this point in the history
  • Loading branch information
shiltemann committed Oct 17, 2024
1 parent 7aa0d12 commit 1fee129
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CONTRIBUTORS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,6 @@ ThibaudGlinez:
- pndb
- elixir-europe

<<<<<<< HEAD
sonjafiliposka:
name: Sonja Filiposka
joined: 2024-07
Expand Down

0 comments on commit 1fee129

Please sign in to comment.