removed artifact from merge conflict

This commit is contained in:
FreezeDriedMangoes 2022-05-25 17:54:45 -04:00
parent 9639ab6a56
commit 8aab28d6b0

View File

@ -228,4 +228,3 @@ namespace NewHorizons.Builder.Props
}
}
}
>>>>>>> dev