Fixing merge errors

Author: StanleyGoldman

src/GitHub.Exports/Models/UsageModel.cs

@@ -13,8 +13,6 @@ public struct UsageModel
         public string VSVersion { get; set; }
         public string Lang { get; set; }
         public string CurrentLang { get; set; }
-        public bool IsGitHubUser { get; set; }
-        public bool IsEnterpriseUser { get; set; }
         public int NumberOfStartups { get; set; }
         public int NumberOfUpstreamPullRequests { get; set; }
         public int NumberOfClones { get; set; }

src/GitHub.VisualStudio/Services/UsageService.cs

@@ -77,46 +77,6 @@ public async Task<Guid> GetUserGuid()
             return userGuid.Value;
         }
 
-        public async Task<Guid> GetUserGuid()
-        {
-            await Initialize();
-
-            if (!userGuid.HasValue)
-            {
-                try
-                {
-                    if (File.Exists(userStorePath))
-                    {
-                        var json = await ReadAllTextAsync(userStorePath);
-                        var data = SimpleJson.DeserializeObject<UserData>(json);
-                        userGuid = data.UserGuid;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    log.Error(ex, "Failed reading user metrics GUID");
-                }
-            }
-
-            if (!userGuid.HasValue || userGuid.Value == Guid.Empty)
-            {
-                userGuid = Guid.NewGuid();
-
-                try
-                {
-                    var data = new UserData { UserGuid = userGuid.Value };
-                    var json = SimpleJson.SerializeObject(data);
-                    await WriteAllTextAsync(userStorePath, json);
-                }
-                catch (Exception ex)
-                {
-                    log.Error(ex, "Failed reading writing metrics GUID");
-                }
-            }
-
-            return userGuid.Value;
-        }
-
         public bool IsToday(DateTimeOffset date)
         {
             return date.Date == DateTimeOffset.Now.Date;