Skip to content
Commit 2785a753 authored by Demi M. Obenour's avatar Demi M. Obenour
Browse files

.gitignore patch conflict files

and remove one that accidentally got committed
parent ae068a09
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment