From a66f84c0d5bff44c26684adc6ccbd26208b34583 Mon Sep 17 00:00:00 2001
From: Garry Newman <garrynewman@gmail.com>
Date: Tue, 25 Oct 2016 13:55:36 +0100
Subject: [PATCH] merge fix

---
 Facepunch.Steamworks/Interfaces/Workshop.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Facepunch.Steamworks/Interfaces/Workshop.cs b/Facepunch.Steamworks/Interfaces/Workshop.cs
index 4238dcb..518c9c5 100644
--- a/Facepunch.Steamworks/Interfaces/Workshop.cs
+++ b/Facepunch.Steamworks/Interfaces/Workshop.cs
@@ -9,7 +9,7 @@ namespace Facepunch.Steamworks
         internal const ulong InvalidHandle = 0xffffffffffffffff;
 
         internal SteamNative.SteamUGC ugc;
-        internal SteamNative.Friends friends;
+        internal Friends friends;
         internal BaseSteamworks steamworks;
         internal SteamNative.SteamRemoteStorage remoteStorage;