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:56:18 -04:00
parent 8aab28d6b0
commit 47dd2c2a3a
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NewHorizons/External/Modules/PropModule.cs vendored
View File

@ -1,14 +1,10 @@
<<<<<<< HEAD
using NewHorizons.Utility; using NewHorizons.Utility;
using System.ComponentModel; using System.ComponentModel;
=======
using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NewHorizons.Utility;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
>>>>>>> dev
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules
{ {
@ -510,13 +506,6 @@ namespace NewHorizons.External.Modules
/// The ship log entries revealed after finishing this slide reel. /// The ship log entries revealed after finishing this slide reel.
/// </summary> /// </summary>
public string[] reveals; public string[] reveals;
<<<<<<< HEAD
public SlideInfo[] slides;
// enum values for this property: "autoProjector", "slideReel", "playerVisionTorchTarget", "standingVisionTorch"
// I don't know why the default value is capital 'S' SlideReel. it should be lower case as far as I can tell.
public string type = "SlideReel";
=======
/// <summary> /// <summary>
/// The rotation of this slideshow. /// The rotation of this slideshow.
@ -532,7 +521,6 @@ namespace NewHorizons.External.Modules
/// The type of object this is. /// The type of object this is.
/// </summary> /// </summary>
public SlideShowType type = SlideShowType.SlideReel; public SlideShowType type = SlideShowType.SlideReel;
>>>>>>> dev
} }
[JsonObject] [JsonObject]