mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
removed artifact from merge conflict
This commit is contained in:
parent
9639ab6a56
commit
8aab28d6b0
@ -228,4 +228,3 @@ namespace NewHorizons.Builder.Props
|
||||
}
|
||||
}
|
||||
}
|
||||
>>>>>>> dev
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user