conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private const string integrationsPrefix = "/integrations/api/v1/";
=======
private const string syncApiPrefix = "/";
>>>>>>>
private const string syncApiPrefix = "/";
private const string integrationsPrefix = "/integrations/api/v1/";
<<<<<<<
public static Uri ForI... |
<<<<<<<
using Toggl.Foundation.MvvmCross.ViewModels.ReportsCalendar;
using Toggl.Foundation.MvvmCross.ViewModels.ReportsCalendar.QuickSelectShortcuts;
=======
using Toggl.Foundation.MvvmCross.ViewModels.Calendar;
using Toggl.Foundation.MvvmCross.ViewModels.Calendar.QuickSelectShortcuts;
using Toggl.Foundation.Service... |
<<<<<<<
using Toggl.Core.Services;
using Toggl.Core.Sync;
using Toggl.Core.UI.Helper;
=======
>>>>>>>
using Toggl.Core.Services;
using Toggl.Core.Sync;
using Toggl.Core.UI.Helper;
<<<<<<<
IRxActionFactory rxActionFactory,
IPermissionsChecker permissionsChecker,
IBackgroundService... |
<<<<<<<
Factory.MetaCode("section").Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Code, " ", CSharpSymbolType.WhiteSpace).Accepts(AcceptedCharactersInternal.WhiteSpace),
Factory.Span(SpanKindInternal.Code, "Header", CSharpSymbolType.I... |
<<<<<<<
public static IObservable<bool> FocusChanged(this IReactive<TextView> reactive)
=> Observable
.FromEventPattern<FocusChangeEventArgs>(e => reactive.Base.FocusChange += e, e => reactive.Base.FocusChange -= e)
.Select(args => ((EditText)args.Sender).HasFocus);
... |
<<<<<<<
"Microsoft.DotNet.Web.ProjectTemplates.5.0",
=======
"Microsoft.DotNet.Web.ProjectTemplates.3.1",
>>>>>>>
"Microsoft.DotNet.Web.ProjectTemplates.3.1",
"Microsoft.DotNet.Web.ProjectTemplates.5.0",
<<<<<<<
"Microsoft.DotNet.Web.Spa.ProjectTemplates.5... |
<<<<<<<
private ReportParameter parameter;
=======
private BeginningOfWeek beginningOfWeek;
>>>>>>>
private ReportParameter parameter;
private BeginningOfWeek beginningOfWeek; |
<<<<<<<
=======
protected override ISuggestionProviderContainer CreateSuggestionProviderContainer()
=> new SuggestionProviderContainer(
new MostUsedTimeEntrySuggestionProvider(Database, TimeService, numberOfSuggestions)
);
protected override IPushNotificationsT... |
<<<<<<<
=======
using Toggl.Foundation.Tests.TestExtensions;
using Toggl.Multivac;
using Toggl.Multivac.Extensions;
>>>>>>> |
<<<<<<<
DataSource.SyncManager.Received().ForceFullSync();
=======
TestScheduler.Start();
DataSource.Received().StartSyncing();
>>>>>>>
TestScheduler.Start();
DataSource.SyncManager.Received().ForceFullSync(); |
<<<<<<<
=======
public InputAction<TimeEntryViewModel> ContinueTimeEntry { get; }
public InputAction<TimeEntryViewModel> SelectTimeEntry { get; }
>>>>>>>
<<<<<<<
[Obsolete("Use RefreshAction RxAction instead")]
public IMvxCommand RefreshCommand { get; }
[Obsolete("Use SyncP... |
<<<<<<<
using Toggl.Core.Services;
using System.Collections.Immutable;
using Toggl.Core.Analytics;
using System.Linq;
using Toggl.Core.UI.Services;
using Toggl.Core.UI.Navigation;
using System.Reactive.Subjects;
using Toggl.Core.Extensions;
using Toggl.Core.Sync;
=======
>>>>>>>
using Toggl.Core.Services;
using Syst... |
<<<<<<<
new Lazy<IIntentDonationService>(() => IntentDonationService),
new Lazy<IPrivateSharedStorageService>(() => PrivateSharedStorageService),
new Lazy<IKeyValueStorage>(() => KeyValueStorage),
new Lazy<IPushNotificationsTokenService>(() => PushNotifica... |
<<<<<<<
// Feedback service is obsolete and is used only in the Android App and should be removed soon
if (foundation.FeedbackService != null)
{
Mvx.RegisterSingleton(foundation.FeedbackService);
}
=======
Mvx.RegisterSingleton(foundation.Pl... |
<<<<<<<
=======
using MvvmCross.Plugin.Color.Platforms.Ios;
>>>>>>>
using Toggl.Daneel.Cells;
<<<<<<<
using CoreAnimation;
using Toggl.Foundation.MvvmCross.Extensions;
=======
using Toggl.Foundation;
using Toggl.Foundation.Extensions;
using Color = Toggl.Foundation.MvvmCross.Helper.Color;
>>>>>>>
using Toggl.Dan... |
<<<<<<<
public long Identifier => Id.GetHashCode();
public SelectableUserCalendarViewModel(UserCalendar calendar, bool initiallySelected)
=======
public SelectableUserCalendarViewModel(UserCalendar calendar, bool selected)
>>>>>>>
public long Identifier => Id.GetHashCode();
... |
<<<<<<<
using Toggl.Core.UI;
using Toggl.Storage;
=======
>>>>>>>
using Toggl.Core.UI;
<<<<<<<
using Toggl.Networking.Network;
=======
using Toggl.Storage;
>>>>>>>
using Toggl.Storage; |
<<<<<<<
using System.Reactive.Disposables;
=======
>>>>>>>
<<<<<<<
using CoreGraphics;
using MvvmCross.Platforms.Ios.Views;
=======
>>>>>>>
using CoreGraphics;
<<<<<<<
private readonly CompositeDisposable disposeBag = new CompositeDisposable();
private ReportsCalendarCollectionViewSource calenda... |
<<<<<<<
public IAnalyticsEvent<OnboardingConditionKey, TooltipDismissReason> TooltipDismissed { get; }
=======
public IAnalyticsEvent LoginWithSso { get; }
public IAnalyticsEvent SsoFlowStarted { get; }
public IAnalyticsEvent SsoUrlRequested { get; }
public IAnalyticsEvent Sso... |
<<<<<<<
public sealed class ReportsViewModel : ViewModel
=======
public sealed class ReportsViewModel : ViewModelWithInput<ReportParameter>
>>>>>>>
public sealed class ReportsViewModel : ViewModel
<<<<<<<
private readonly IIntentDonationService intentDonationService;
=======
private re... |
<<<<<<<
=> new ReportsCalendarViewModel(TimeService, DataSource, IntentDonationService, RxActionFactory, NavigationService);
=======
=> new ReportsCalendarViewModel(TimeService, DialogService, DataSource, RxActionFactory);
>>>>>>>
=> new ReportsCalendarViewModel(TimeSe... |
<<<<<<<
=======
dependencyContainer.UpdateRemoteConfigCacheService,
dependencyContainer.SuggestionProviderContainer,
>>>>>>>
dependencyContainer.UpdateRemoteConfigCacheService,
<<<<<<<
=======
dependencyContainer.UpdateRemoteConfigCac... |
<<<<<<<
public virtual IObservable<IEnumerable<IConflictResolutionResult<TThreadsafe>>> OverwriteIfOriginalDidNotChange(TThreadsafe original, TThreadsafe entity)
=> Repository.UpdateWithConflictResolution(original.Id, entity, ignoreIfChangedLocally(original), RivalsResolver)
.ToThrea... |
<<<<<<<
=======
internal ISuggestionProviderContainer MockSuggestionProviderContainer { get; set; }
protected override ISuggestionProviderContainer CreateSuggestionProviderContainer()
=> MockSuggestionProviderContainer;
internal IPushNotificationsTokenService MockPushNotifications... |
<<<<<<<
IQuery<Unit> PersistExternalCalendarsData(Dictionary<IExternalCalendar, IEnumerable<IExternalCalendarEvent>> calendarData);
=======
IQuery<Unit> ResetLocalState(Networking.Sync.Pull.IResponse response);
>>>>>>>
IQuery<Unit> ResetLocalState(Networking.Sync.Pull.IResponse response);
... |
<<<<<<<
var firstTimeOpenedFromMainTabBarStopwatch = stopwatchProvider.Get(MeasuredOperation.OpenReportsViewForTheFirstTime);
stopwatchProvider.Remove(MeasuredOperation.OpenReportsViewForTheFirstTime);
firstTimeOpenedFromMainTabBarStopwatch?.Stop();
firstTimeOpenedFromMa... |
<<<<<<<
private TextView durationLabel;
private Toolbar toolbar;
=======
>>>>>>>
private TextView durationLabel;
<<<<<<<
durationLabel = FindViewById<TextView>(Resource.Id.DurationLabel);
toolbar = FindViewById<Toolbar>(Resource.Id.Toolbar);
=======
Set... |
<<<<<<<
private readonly INotificationService notificationService;
=======
private readonly IIntentDonationService intentDonationService;
>>>>>>>
private readonly INotificationService notificationService;
private readonly IIntentDonationService intentDonationService;
<<<<<<<
... |
<<<<<<<
=======
using Toggl.iOS.Presentation.Attributes;
using Toggl.Shared;
>>>>>>>
using Toggl.Shared; |
<<<<<<<
IAnalyticsEvent<CalendarContextualMenuActionType> CalendarEventContextualMenu { get; }
IAnalyticsEvent<CalendarContextualMenuActionType> CalendarNewTimeEntryContextualMenu { get; }
IAnalyticsEvent<CalendarContextualMenuActionType> CalendarExistingTimeEntryContextualMenu { get; }
... |
<<<<<<<
public TimeEntriesViewModel(
ITogglDataSource dataSource,
IInteractorFactory interactorFactory,
IAnalyticsService analyticsService,
ISchedulerProvider schedulerProvider,
IRxActionFactory rxActionFactory,
ITimeService timeService)
=... |
<<<<<<<
using Toggl.Daneel.Intents;
using Toggl.Daneel.ViewControllers;
using Toggl.Foundation;
=======
using Toggl.Foundation;
>>>>>>>
using Toggl.Daneel.Intents;
using Toggl.Daneel.ViewControllers;
using Toggl.Foundation;
<<<<<<<
public override bool ContinueUserActivity(UIApplication application, NSUserA... |
<<<<<<<
using Toggl.Foundation.Interactors;
=======
using Toggl.Foundation.Models.Interfaces;
>>>>>>>
using Toggl.Foundation.Interactors;
using Toggl.Foundation.Models.Interfaces;
<<<<<<<
private readonly IInteractorFactory interactorFactory;
=======
private readonly IAnalyticsService analyticsSer... |
<<<<<<<
public sealed partial class AppDelegate : MvxApplicationDelegate<Setup, App<OnboardingViewModel>>, IUNUserNotificationCenterDelegate, IMessagingDelegate
=======
public sealed partial class AppDelegate : UIApplicationDelegate, IUNUserNotificationCenterDelegate
>>>>>>>
public sealed partial class A... |
<<<<<<<
[Test]
public void boolean_attr() {
var tag = new HtmlTag("input").BooleanAttr("required");
tag.HasAttr("required").ShouldBeTrue();
}
[Test]
public void render_boolean_attr() {
var tag = new HtmlTag("input").BooleanAttr("required");
... |
<<<<<<<
private readonly IAddressTranslator _addressTranslator;
=======
private volatile Host _host;
private volatile Connection _connection;
>>>>>>>
private readonly IAddressTranslator _addressTranslator;
private volatile Host _host;
private volatile Connection _conne... |
<<<<<<<
using Cassandra.Tests;
using NUnit.Framework;
=======
using Cassandra.IntegrationTests.TestBase;
using Cassandra.IntegrationTests.TestClusterManagement;
using NUnit.Framework;
>>>>>>>
using Cassandra.IntegrationTests.TestBase;
using Cassandra.IntegrationTests.TestClusterManagement;
using Cassandra.Tests;
usi... |
<<<<<<<
Version = TestClusterManager.CassandraVersion.ToString();
DseVersion = TestClusterManager.IsDse ? TestClusterManager.DseVersion.ToString() : null;
Name = TestUtils.GetTestClusterNameBasedOnTime();
=======
Version = TestClusterManager.CassandraVersionText;
... |
<<<<<<<
_testCluster = TestClusterManager.GetTestCluster(3);
_keyspace = _testCluster.DefaultKeyspace;
_session = _testCluster.Session;
try
{
_session.Execute(String.Format(TestUtils.CreateTableAllTypes, AllTypesTableName));
}
... |
<<<<<<<
.UseDefaultHostingConfiguration(args)
=======
// We set the server by name before default args so that command line arguments can override it.
// This is used to allow deployers to choose the server for testing.
.UseServer("Microsoft.AspNetCore.S... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Cassandra.IntegrationTests.TestBase;
using Cassandra.IntegrationTests.TestClusterManagement.Simulacron;
using NUnit.Framework;
namespace Cassandra.IntegrationTests.Core
{
[TestFixture, Category("short")]
... |
<<<<<<<
protected override void AbortCore(ConnectionAbortedException abortReason)
=======
public override void Abort(ConnectionAbortedException abortReason)
>>>>>>>
public override void Abort(ConnectionAbortedException abortReason)
<<<<<<<
=======
var buffer = result.Buffe... |
<<<<<<<
#line 56 "C:\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\JQueryPromisesClientTemplate.tt"
=======
#line 56 "C:\Data\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\JQueryPromisesClientTemplate.tt"
if(operation.HasContent){
#line ... |
<<<<<<<
#line 53 "C:\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\AngularJSClientTemplate.tt"
=======
#line 53 "C:\Data\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\AngularJSClientTemplate.tt"
if(operation.HasContent){
#line default
... |
<<<<<<<
public async Task ClientStreaming_ResponseCompletesWithPendingRead_ThrowError()
{
// Arrange
var requestStreamTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
RequestDelegate appDelegate = async ctx =>
{
... |
<<<<<<<
[Description("Specifies whether to call CreateHttpClientAsync on the base class to create a new HttpClient.")]
[Argument(Name = "GenerateClientInterfaces", DefaultValue = false)]
public bool GenerateClientInterfaces { get; set; }
[Description("Specifies whether a required proper... |
<<<<<<<
#line 50 "C:\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\JQueryCallbacksClientTemplate.tt"
=======
#line 50 "C:\Data\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\JQueryCallbacksClientTemplate.tt"
if(operation.HasContent){
#line ... |
<<<<<<<
#line 54 "C:\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\FetchClientTemplate.tt"
if(!operation.IsGetOrHead){
=======
#line 54 "C:\Data\Projects\NSwag\src\NSwag.CodeGeneration.TypeScript\Templates\FetchClientTemplate.tt"
if(operation.HasContent){
>>>>>>>
#l... |
<<<<<<<
patternNode.NodeTableObjectName = nodeTable.TableObjectName;
if (patternNode.NodeTableObjectName.SchemaIdentifier == null)
patternNode.NodeTableObjectName.Identifiers.Insert(0, new Identifier {Value = "dbo"});
... |
<<<<<<<
using EventStore.ClientAPI;
using EventStore.ClientAPI.SystemData;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace HealthChecks.EventStore
{
public class EventStoreHealthCheck
: IHealthCheck
{
const stri... |
<<<<<<<
public virtual Task SignOutAsync(AuthenticationProperties properties)
{
// Create a new ticket containing an empty identity and
// the authentication properties extracted from the context.
var ticket = new AuthenticationTicket(
new ClaimsPrinci... |
<<<<<<<
=======
if (string.IsNullOrEmpty(ContentHeader))
HasHeader = false;
LocationOfMyWindow = @params.WindowStartupLocation;
>>>>>>> |
<<<<<<<
=======
if (string.IsNullOrEmpty(ContentHeader))
HasHeader = false;
LocationOfMyWindow = @params.WindowStartupLocation;
>>>>>>> |
<<<<<<<
public static void ChangeColorEffect(float[,] matrix)
=======
public static float[,] Multiply(float[,] a, float[,] b)
{
if (a.GetLength(1) != b.GetLength(0))
{
throw new Exception("a.GetLength(1) != b.GetLength(0)");
}
float[,] c = new float[a.GetLength(0), b.GetLength(1)];
for (int i... |
<<<<<<<
using System.Runtime.CompilerServices;
using System.Windows.Diagnostics;
using System.Windows.Interop;
=======
using System.Runtime.CompilerServices;
>>>>>>>
using System.Runtime.CompilerServices;
<<<<<<<
public enum NoiseType { Simplex, OpenSimplex2/*, OpenSimplex2S*/, Cellular, Perlin, ValueCubic, Val... |
<<<<<<<
using System.Collections.Generic;
using StructureMap.Pipeline;
=======
using StructureMap;
using IContainer = Bifrost.Execution.IContainer;
>>>>>>>
using StructureMap.Pipeline;
<<<<<<<
/// <inheritdoc/>
public BindingLifecycle DefaultLifecycle { get; set; }
ILifecycle GetInstanceSc... |
<<<<<<<
=======
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
>>>>>>>
using System.Collections.Generic;
<<<<<<<
public override int GetHashCode() => _descriptor?.GetHashCode() ?? 0;
=======
[SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
public o... |
<<<<<<<
public event Action? Registered;
public event Action<PeerId, PeerUpdateAction>? PeerUpdated;
=======
public event Action Registered;
public event Action<PeerId, PeerUpdateAction> PeerUpdated;
public event Action<PeerId, IReadOnlyList<Subscription>> PeerSubscriptionsUpda... |
<<<<<<<
using Content.Shared.GameObjects.Components.Interactable;
=======
using Content.Server.Utility;
>>>>>>>
using Content.Shared.GameObjects.Components.Interactable;
using Content.Server.Utility; |
<<<<<<<
using Content.Server.Chemistry;
=======
using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Linq;
using Content.Server.Chemistry;
using Content.Shared.GameObjects.Components.Chemistry;
using Content.Server.GameObjects.Components.Nutrition;
>>>>>>>
using Content... |
<<<<<<<
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out BuckleComponent buckle))
{
return false;
}
return buckle.ToggleBuckle(eventArgs.User, Owner);
}
=======
p... |
<<<<<<<
FinishSuperconduction(BlocksAllAir ? _temperature : Air.Temperature);
=======
FinishSuperconduction(BlocksAir ? Temperature : Air.Temperature);
>>>>>>>
FinishSuperconduction(BlocksAllAir ? Temperature : Air.Temperature); |
<<<<<<<
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Client.GameObjects;
=======
using Content.Client.GameObjects.Components.Strap;
using Content.Client.Interfaces.GameObjects.Components.Interaction;
using Content.Shared.GameObjects.Components.Mobs;
>>>>>>>
using Content.Client.GameObjects.Compon... |
<<<<<<<
_documentStore.Conventions.DocumentKeyGenerator = (a,b,c) => string.Format("{0}/{1}", CollectionName, keyGenerator.NextFor<IEvent>());
_documentStore.Conventions.IdentityTypeConvertors.Add(new ConceptTypeConverter());
=======
_documentStore.Conventions.DocumentKeyGenerator ... |
<<<<<<<
=======
using System.Reflection;
using System.Text.RegularExpressions;
>>>>>>>
using System.Reflection; |
<<<<<<<
TestName = result.Method.FullName,
IsPrimary = isPrimary,
ErrorMessage = result.ErrorMessage,
StackTrace = result.StackTrace
};
lineResults.Add(new KeyValuePair<int, LineResult>(stackItem.Line - 1, lineResult));
======... |
<<<<<<<
using Controls;
=======
using Elements2D;
>>>>>>>
using Controls;
using Elements2D; |
<<<<<<<
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// 有关程序集的常规信息通过以下
// 特性集控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("Wox")]
[assembly: AssemblyDescription("https://github.com/qianlifeng/Wox")]
[assembl... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Visible;
=======
MainVM.IsProgressBarVisible = true;
>>>>>>>
MainVM.ProgressBarVisibility = Visibility.Visible;
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Collapsed;
=====... |
<<<<<<<
=======
using Wox.Core.UserSettings;
using Wox.Helper;
>>>>>>>
using Wox.Helper;
<<<<<<<
if (IsContextMenuVisible)
=======
if (ContextMenuVisibility.IsVisible())
>>>>>>>
if (ContextMenuVisibility.IsVisible())
<<<<<<<
if (IsContextMenuVisib... |
<<<<<<<
using System.IO.Compression;
using System.Globalization;
using System.Linq;
using System.Drawing;
using Depressurizer.Lib;
=======
using Depressurizer.Properties;
>>>>>>>
using Depressurizer.Lib;
using Depressurizer.Properties; |
<<<<<<<
private static Regex regFlags = new Regex( "<div class=\\\"game_area_details_specs\\\">\\s*<div class=\\\"icon\\\"><a href=[^>]*><img[^>]*></a></div>\\s*<div class=\\\"name\\\"><a href=[^>]*>([^<]*)</a></div>", RegexOptions.IgnoreCase | RegexOptions.Compiled );
private static Regex regDevelopers... |
<<<<<<<
Crx = 22,
/// <summary>Truevision graphics.</summary>
Tga = 23
=======
Crx = 22,
/// <summary>Encapsulated PostScript</summary>
Eps = 23 //("EPS", "Encapsulated PostScript", "application/postscript", "eps", "epsf", "epsi"),
>>>>>>>
Crx = 22,
/... |
<<<<<<<
=======
using System.Collections.Specialized;
using System.Diagnostics;
>>>>>>>
using System.Diagnostics;
<<<<<<<
static ISerialize defaultSerializer = WrappersHelper.Instance.GetSerializer<ProtobufSerializer>();
static ICompress defaultCompressor = WrappersHelper.Instance.GetCompressor<Seve... |
<<<<<<<
public const string NetCoreApp50 = "netcoreapp5.0";
=======
public const string NetCoreApp31 = "netcoreapp3.1";
>>>>>>>
public const string NetCoreApp31 = "netcoreapp3.1";
public const string NetCoreApp50 = "netcoreapp5.0"; |
<<<<<<<
// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, co... |
<<<<<<<
// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, co... |
<<<<<<<
// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, cop... |
<<<<<<<
private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, object, bool> include, object state = null)
=======
private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, bool> include, CancellationToken cancellationToken)
... |
<<<<<<<
/// <summary>
/// This class contains the required data for each connection to the server.
/// </summary>
public class Context : IDisposable
{
/// <summary>
/// The exported version of this context.
/// </summary>
public readonly UserContext UserContext;
... |
<<<<<<<
#region Web JSObject Part
public UInt16 Port { get; set; }
public UInt16 UPnPPort { get; set; }
public String Hostname { get; set; }
=======
public ushort Port { get; set; }
public ushort UPnPPort { get; set; }
public string Hostname { get; set; }
>>>>>... |
<<<<<<<
private static void Postfix(ref ItemDrop __instance)
{
if (!Configuration.Current.Items.IsEnabled) return; // if items config not enabled, continue with original method
if (Configuration.Current.Items.droppedItemOnGroundDurationInSeconds.Equals(defaultSpawnTimeSeconds)) ... |
<<<<<<<
public VagonConfiguration Wagon { get; set; }
public FreePlacementRotationConfiguration FreePlacementRotation { get; set; }
=======
public WagonConfiguration Wagon { get; set; }
public GatherConfiguration Gathering { get; set; }
public DurabilityConfiguration Durability... |
<<<<<<<
/// <summary>
/// Resize child EffectArea's collision that matches the specified type(s).
/// </summary>
=======
public static Texture2D LoadPng(Stream fileStream)
{
Texture2D texture = null;
if (fileStream != null)
{
... |
<<<<<<<
using System;
using HarmonyLib;
=======
using HarmonyLib;
>>>>>>>
using System;
using HarmonyLib;
<<<<<<<
=======
using System;
using ValheimPlus.Configurations;
>>>>>>>
using ValheimPlus.Configurations; |
<<<<<<<
=======
using AlphaTab.Rendering.Utils;
using AlphaTab.Rendering.Glyphs;
using AlphaTab.Util;
>>>>>>>
using AlphaTab.Rendering.Utils;
using AlphaTab.Rendering.Glyphs;
using AlphaTab.Util;
<<<<<<<
// finalize group (sizing etc).
FitGroup(group);
group.FinalizeG... |
<<<<<<<
private System.Windows.Forms.CheckBox checkBoxWaveformSnapToSceneChanges;
private System.Windows.Forms.CheckBox checkBoxWaveformSingleClickSelect;
=======
private System.Windows.Forms.Label labelSplitBehavior;
private System.Windows.Forms.ComboBox comboBoxSplitBehavior;
>>>>>>... |
<<<<<<<
private SocialNPC Marlon = null;
private SocialNPC Morris = null;
private bool firstTick = true;
=======
private SocialNPC Marlon = null;
private SocialNPC Morris = null;
>>>>>>>
private SocialNPC Marlon = null;
private SocialNPC Morris = null;
<<<<<<... |
<<<<<<<
public abstract class VolumeStorage<T> : IDisposable
where T : struct, IEquatable<T>, IFormattable
=======
public abstract class VolumeStorage<T> where T : struct, IEquatable<T>, IFormattable
>>>>>>>
public abstract class VolumeStorage<T> where T : struct, IEquatable<T>, IFormattable
<<<... |
<<<<<<<
public abstract void DoSubtractFrom(Volume<T> other, Volume<T> result);
=======
>>>>>>>
public abstract void DoSubtractFrom(Volume<T> other, Volume<T> result); |
<<<<<<<
this.upgraderConfig = new NuGetUpgrader.NuGetUpgraderConfig(this.tracer, null, NuGetFeedUrl, NuGetFeedName, NuGetFeedUrlForCredentials);
=======
this.upgraderConfig = new NuGetUpgrader.NuGetUpgraderConfig(this.tracer, null, NuGetFeedUrl, NuGetFeedName);
this.downloadFolder ... |
<<<<<<<
public abstract IEnumerable<EventListener> CreateTelemetryListeners(string providerName, string enlistmentId, string mountId);
=======
public abstract bool TryVerifyAuthenticodeSignature(string path, out string subject, out string issuer, out string error);
public abstract InProcEvent... |
<<<<<<<
"System.Diagnostics",
=======
"System.ComponentModel",
>>>>>>>
"System.Diagnostics",
"System.ComponentModel", |
<<<<<<<
} else if (attr is SealedAttribute || attr is EventArgsAttribute || attr is DelegateNameAttribute || attr is EventNameAttribute || attr is DefaultValueAttribute || attr is ObsoleteAttribute || attr is AlphaAttribute || attr is DefaultValueFromArgumentAttribute || attr is NewAttribute || attr is SinceAttrib... |
<<<<<<<
rootCommand.AddValidator(EnsureFolderNotSpecifiedWithNoRestore);
=======
rootCommand.AddValidator(EnsureFolderNotSpecifiedWhenLoggingBinlog);
>>>>>>>
rootCommand.AddValidator(EnsureFolderNotSpecifiedWithNoRestore);
rootCommand.AddValidator(EnsureFolderNotSpecif... |
<<<<<<<
dockablePane1.Children.Add(layout);
dockablePane1.Children.RemoveElementsNoReturn(d => d.Content == null);
=======
dockablePane2.Children.Add(layout);
dockablePane2.Children.RemoveElementsNoReturn(d => d.Content ==... |
<<<<<<<
// Copyright (c) 2011 - 2014 OJ Reeves & Jeremiah Peschka
// Copyright (c) 2014 - Basho Technologies, Inc.
=======
// Copyright (c) 2011 - OJ Reeves & Jeremiah Peschka
// Copyright (c) 2015 - Basho Technologies, Inc.
>>>>>>>
// Copyright (c) 2011 - 2014 OJ Reeves & Jeremiah Peschka
// Copyright (c) 2014 - Ba... |
<<<<<<<
var result = node.UseConnection(c => c.PbcWriteRead<RpbPingReq, RpbPingResp>(new RpbPingReq()));
=======
var result = node.UseConnection(_pollClientId, c => c.PbcWriteRead(MessageCode.PingReq, MessageCode.PingResp));
>>>>>>>
var result = node.UseCon... |
<<<<<<<
var result = _encoder.Decode<TResult>(PbcClientStream);
=======
if (Read)
{
System.Diagnostics.Debugger.Break();
}
var data = _socket.Receive();
var result = _encoder.Decode<TResult>(data);
... |
<<<<<<<
// <copyright file="BasicSetDtTests.cs" company="Basho Technologies, Inc.">
// Copyright (c) 2015 - Basho Technologies
=======
// Copyright 2011 - OJ Reeves & Jeremiah Peschka
>>>>>>>
// <copyright file="BasicSetDtTests.cs" company="Basho Technologies, Inc.">
// Copyright 2015 - Basho Technologies |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.