Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed artifact from merge conflict

Browse Source
This commit is contained in:
FreezeDriedMangoes 2022-05-25 17:54:45 -04:00
parent 9639ab6a56
commit 8aab28d6b0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NewHorizons/Builder/Props/DetailBuilder.cs
View File

@ -227,5 +227,4 @@ namespace NewHorizons.Builder.Props
return prop;
}
}
}
>>>>>>> dev
}