From 1d9d01b355147e8a3d1cc65266bb74915e299f31 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 1 Aug 2019 00:13:49 +0200 Subject: [PATCH] Update submodule. --- Content.Client/Parallax/ParallaxManager.cs | 6 +++--- RobustToolbox | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs index 74d18d0f47..f534472456 100644 --- a/Content.Client/Parallax/ParallaxManager.cs +++ b/Content.Client/Parallax/ParallaxManager.cs @@ -3,8 +3,6 @@ using System.IO; using System.Threading.Tasks; using Content.Client.Interfaces.Parallax; using Nett; -using SixLabors.ImageSharp; -using SixLabors.Primitives; using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.Interfaces.Configuration; @@ -12,6 +10,8 @@ using Robust.Shared.Interfaces.Log; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; +using SixLabors.ImageSharp; +using SixLabors.Primitives; namespace Content.Client.Parallax { @@ -39,7 +39,7 @@ namespace Content.Client.Parallax return; } - MemoryStream configStream = null; + Stream configStream = null; string contents; TomlTable table; try diff --git a/RobustToolbox b/RobustToolbox index fa10e1c330..85a4375905 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fa10e1c330da9613d4598154a71cfeb7bdb6dd00 +Subproject commit 85a4375905e37a218f77a54525563c4410e53305