conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
this.EditAttributeFileButton = new System.Windows.Forms.Button();
this.EditIgnoreFileButton = new System.Windows.Forms.Button();
=======
this.AttributesFileButton = new System.Windows.Forms.Button();
this.IgnoreFileButton = new System.Windows.Forms.Button();
>>... |
<<<<<<<
public void FunctionReturnValueNotUsed_QuickFixWorks_NoInterface()
{
const string inputCode =
@"Public Function Foo(ByVal bar As String) As Boolean
If True Then
Foo = _
True
Else
Foo = False
End If
End Function";
const string expectedC... |
<<<<<<<
/// <param name="content">Member body content. Null results in an empty body. Formatting is the responsibility of the caller</param>
=======
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to '<paramref name="propertyIdentifier"/>... |
<<<<<<<
/// Looks up a localized string similar to To the variable '{0}' of declared type '{1}' a value is set assigned with the incompatible declared type '{2}'. .
/// </summary>
public static string SetAssignmentWithIncompatibleObjectTypeInspection {
... |
<<<<<<<
correctors.Add(new OCLConstraintsCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new AssociationTableCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new FixCallBehaviorActionCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new ConvertPropertiesToAttributes(magi... |
<<<<<<<
Debug.Print("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
=======
>>>>>>>
Debug.Print("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
<<<<<<<
var declarations = _state.AllDeclarations;
ICodeModuleWrapper codeModuleWrapper = ne... |
<<<<<<<
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
=======
using Rubberduck.Inspections.Resources;
using Rubberduck.UI;
>>>>>>>
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application... |
<<<<<<<
public void VariableTypeNotDeclared_QuickFixWorks_Parameter()
{
const string inputCode =
@"Sub Foo(arg1)
End Sub";
const string expectedCode =
@"Sub Foo(arg1 As Variant)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var comp... |
<<<<<<<
m_GraphView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
m_GraphView.onSelectionChanged += m_GraphInspectorView.UpdateSelection;
=======
m_GraphInspectorView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
>>>>>>>
m_GraphView.RegisterCallba... |
<<<<<<<
var info = new DirectoryInfo(_rootPath);
return info.GetFiles().Select(file => file.Name).Where(name => name.EndsWith(Template.TemplateExtension)).ToList();
=======
var info = _filesystem.DirectoryInfo.FromDirectoryName(_rootPath);
return info.GetFiles().Select(... |
<<<<<<<
using MMALSharp.Ports.Controls;
using MMALSharp.Utility;
=======
using MMALSharp.Ports;
>>>>>>>
using MMALSharp.Ports.Controls; |
<<<<<<<
private void CbShowPageTooltips_OnChecked(object sender, RoutedEventArgs e)
{
if (IsInitialized)
{
App.Config.ShowPageTooltips = !((CheckBox) sender).IsChecked.Value;
App.Config.Save();
MainPage._MainPage.UpdateTooltips();
... |
<<<<<<<
using FSO.Client.Controllers;
=======
using FSO.Common;
using FSO.Common.Rendering.Framework.IO;
>>>>>>>
using FSO.Client.Controllers;
using FSO.Common;
using FSO.Common.Rendering.Framework.IO;
<<<<<<<
//int min = NetworkFacade.ServerTime.Minute;
//int hour = NetworkFacade.ServerTime... |
<<<<<<<
using FSO.Client.Controllers;
using System.Text.RegularExpressions;
=======
using FSO.Client.GameContent;
using FSO.Client.UI.Model;
>>>>>>>
using FSO.Client.Controllers;
using System.Text.RegularExpressions;
using FSO.Client.GameContent;
using FSO.Client.UI.Model; |
<<<<<<<
using FSO.Common.Utils;
using FSO.Common.DataService.Model;
using FSO.Client.Controllers;
using FSO.Common.DatabaseService.Model;
=======
using FSO.Common;
>>>>>>>
using FSO.Common.Utils;
using FSO.Common.DataService.Model;
using FSO.Client.Controllers;
using FSO.Common.DatabaseService.Model;
using FSO.Commo... |
<<<<<<<
=======
UIGraphics = new UIGraphicsProvider(this);
AvatarMeshes = new AvatarMeshProvider(this, Device);
>>>>>>>
<<<<<<<
AvatarCollections = new AvatarCollectionsProvider(this);
AvatarThumbnails = new AvatarThumbnailProvider(this);
=======
Avatar... |
<<<<<<<
using static FSO.Content.WorldObjectCatalog;
=======
using FSO.Common;
>>>>>>>
using static FSO.Content.WorldObjectCatalog;
using FSO.Common; |
<<<<<<<
using FSO.Server.Protocol.CitySelector;
using FSO.Vitaboy;
using FSO.Client.Regulators;
using Ninject;
using FSO.Client.Controllers;
=======
using FSO.HIT;
using FSO.Client.UI.Model;
>>>>>>>
using FSO.Server.Protocol.CitySelector;
using FSO.Vitaboy;
using FSO.Client.Regulators;
using Ninject;
using FSO.Clien... |
<<<<<<<
using Ninject;
using FSO.Client.Regulators;
using FSO.Server.Protocol.Voltron.DataService;
using FSO.Common.DataService;
using FSO.Server.DataService.Providers.Client;
using FSO.Common.Domain;
using FSO.Common.Utils;
=======
using FSO.Common;
using Microsoft.Xna.Framework.Audio;
using System.Windows.Forms;
>... |
<<<<<<<
AvatarCollections = new AvatarCollectionsProvider(this);
=======
AvatarHandgroups = new HandgroupProvider(this, Device);
AvatarThumbnails = new AvatarThumbnailProvider(this, Device);
>>>>>>>
AvatarCollections = new AvatarCollectionsProvider(this);
A... |
<<<<<<<
using FSO.Client.Controllers;
using FSO.Client.Controllers.Panels;
=======
using FSO.Client.Debug;
using FSO.Client.UI.Panels.WorldUI;
using FSO.SimAntics.Engine.TSOTransaction;
>>>>>>>
using FSO.Client.Controllers;
using FSO.Client.Controllers.Panels;
using FSO.Client.Debug;
using FSO.Client.UI.Panels.World... |
<<<<<<<
private IDictionary<string, ThreeDRepFile> _representationFiles;
private IDictionary<string, ReferenceRep> _internalReferenceRepresentation;
private IDictionary<string, InstanceRep> _internalInstanceRepresentation;
=======
private IDictionary<string, ThreeDXMLFile> _representat... |
<<<<<<<
//SimCatalog.LoadSim3D(sim, maleHeads.First().PurchasableObject.Outfit, AppearanceType.Light);
//
sim.HeadOutfitID = 4462471020557;
sim.AppearanceType = AppearanceType.Light;
SimCatalog.LoadSim3D(sim);
=======
SimCatalog.LoadSim3D(sim, ... |
<<<<<<<
=======
public static Texture2D StoreTexture(ulong id, ContentResource assetData)
{
return StoreTexture(id, assetData, true, false);
}
public static Texture2D StoreTexture(ulong id, ContentResource assetData, bool mask, bool cacheOnDisk)
{
... |
<<<<<<<
int ExplicitInterfaceMember();
=======
void ThrowException(string message);
>>>>>>>
int ExplicitInterfaceMember();
void ThrowException(string message); |
<<<<<<<
[Fact]
public async Task ExplicitInterfaceOperation()
{
int actual = await _client.InvokeAsync(x => x.ExplicitInterfaceMember());
Assert.True(actual == 0);
}
=======
[Fact]
public async Task ThrowException()
{
try
... |
<<<<<<<
if (_throttle != null)
await _throttle.WaitAsync();
TcpClient client = await _listener.AcceptTcpClientAsync();
=======
TcpClient client = await _listener.AcceptTcpClientAsync().ConfigureAwait(false);
>>>>>>>
... |
<<<<<<<
if (client == null)
=======
if (client == null || IsSelecting)
{
>>>>>>>
if (client == null || IsSelecting)
{
<<<<<<<
public string SelectionMode
{
get { return _selectionMode; }
set
{
... |
<<<<<<<
protected override void OnShareTargetActivated(ShareTargetActivatedEventArgs args)
{
base.OnShareTargetActivated(args);
OnActivated(args);
}
protected override void OnFileSavePickerActivated(FileSavePickerActivatedEventArgs args)
{
bas... |
<<<<<<<
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();
=======
sigStr.Close();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect();
>>>>>>>
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.G... |
<<<<<<<
=======
public GameStateData gameState;
>>>>>>>
public GameStateData gameState;
<<<<<<<
//DontDestroyOnLoad(gameObject);
actionList = listBuilder();
//testRun();
=======
//testRun();
>>>>>>>
//testRun(); |
<<<<<<<
object[] a)
{
StringBuilder sb = new StringBuilder('[');
if (a.Length > 0)
{
sb.Append(a[0]);
for (int index = 1; index < a.Length; ++index)
{
sb.Append(", ").Append(a[index]);
... |
<<<<<<<
[TestFixture]
public class SecureRandomTest
{
#if !NETCF_1_0 && !PCL
[Test]
public void TestCryptoApi()
{
SecureRandom random = new SecureRandom(
new CryptoApiRandomGenerator());
checkSecureRandom(random);
}
=======
[TestFixture]
public class SecureRandomTest
{
#if !NETCF_1_0... |
<<<<<<<
#if NETCF_1_0 || PCL
=======
>>>>>>> |
<<<<<<<
sigStr.Dispose();
byte[] sigBytes = sig.GenerateSignature();
=======
sigStr.Close();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();
>>>>>>>
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal(); |
<<<<<<<
using System.Linq;
=======
using System.Text.RegularExpressions;
>>>>>>>
using System.Text.RegularExpressions;
using System.Linq; |
<<<<<<<
[Parser(Opcode.SMSG_CANCEL_AUTO_REPEAT)]
public static void HandleCancelAutoRepeat(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 1, 3, 0, 4, 6, 7, 5, 2);
packet.ParseBitStream(guid, 7, 6, 2, 5, 0, 4, 1, 3);
packet.... |
<<<<<<<
SpellTargetPositions.Clear();
=======
LocalesQuests.Clear();
LocalesQuestObjectives.Clear();
>>>>>>>
SpellTargetPositions.Clear();
LocalesQuests.Clear();
LocalesQuestObjectives.Clear(); |
<<<<<<<
// ReSharper disable InconsistentNaming
broadcast_text,
=======
// ReSharper disable InconsistentNaming
areatrigger_template,
areatrigger_template_polygon_vertices,
>>>>>>>
// ReSharper disable InconsistentNaming
areatrigger_template,
areatrigger_templa... |
<<<<<<<
using PacketParser.Enums;
using PacketParser.Misc;
using PacketParser.Processing;
using PacketParser.DataStructures;
using Guid = PacketParser.DataStructures.Guid;
=======
using WowPacketParser.Enums;
using WowPacketParser.Misc;
using WowPacketParser.Store.Objects;
using Guid=WowPacketParser.Misc.Guid;
using ... |
<<<<<<<
{Opcode.CMSG_ACTIVATETAXI, 0x03C9},
{Opcode.CMSG_ACTIVATETAXIEXPRESS, 0x06FB},
=======
{Opcode.CMSG_ACTIVATETAXI, 0x03C9},
{Opcode.CMSG_ACTIVATETAXIEXPRESS, 0x06FB},
{Opcode.CMSG_ADD_FRIEND, 0x09A6},
{Opcode.CMSG_ADD_IGNORE, 0x0D20},
... |
<<<<<<<
using mRemoteNG.Themes;
using mRemoteNG.UI.Forms;
using System.Drawing;
=======
>>>>>>>
using mRemoteNG.Themes;
using mRemoteNG.UI.Forms;
using System.Drawing;
<<<<<<<
private WindowType _WindowType;
private DockContent _DockPnl;
private ThemeManager _themeManager;
=======
>>>>>>... |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Highest")]
public string ConDefaultRdpProtocolVersion {
get {
r... |
<<<<<<<
using System.Linq;
using System.Xml;
=======
using System.Xml;
using System.Xml.Linq;
>>>>>>>
using System.Linq;
using System.Xml;
using System.Xml.Linq; |
<<<<<<<
public bool ShowOnToolbar { get; set; } = true;
=======
public bool RunElevated { get; set; }
>>>>>>>
public bool ShowOnToolbar { get; set; } = true;
public bool RunElevated { get; set; } |
<<<<<<<
this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 118);
=======
this.chkIdentifyQuickConnectTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkIdentifyQuickC... |
<<<<<<<
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
=======
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")... |
<<<<<<<
using System.Windows.Forms;
=======
>>>>>>>
<<<<<<<
_startupDataLogger.Execute();
CompatibilityChecker.CheckCompatibility();
ParseCommandLineArgs();
=======
var startupLogger = new StartupDataLogger(messageCollector);
startupLogger.LogStartupData... |
<<<<<<<
private MultiSSHController _multiSSHController ;
=======
>>>>>>>
private MultiSSHController _multiSSHController ; |
<<<<<<<
private static string GetRoleName()
{
return RoleEnvironment.GetConfigurationSettingValue(Constants.ReplicaSetNameSetting);
}
=======
>>>>>>> |
<<<<<<<
[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationLevel)),
LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationLev... |
<<<<<<<
connectionInfo.RdpProtocolVersion = xmlnode.GetAttributeAsEnum("RdpProtocolVersion", RdpVersion.Highest);
connectionInfo.Inheritance.RdpProtocolVersion = xmlnode.GetAttributeAsBool("InheritRdpProtocolVersion");
=======
connectionInfo.Inheritance.UseV... |
<<<<<<<
var pages = new UserControl[]
=======
var credentialManagerForm = new CredentialManagerForm(CredentialManager)
>>>>>>>
var pages = new UserControl[]
<<<<<<<
var credentialManagerForm = new CredentialManagerForm(pages);
credentialManagerForm.CenterO... |
<<<<<<<
using AspNetCore.Identity.MongoDbCore.Models;
using Microsoft.AspNetCore.Identity;
using AspNetCore.Identity.MongoDbCore.Infrastructure;
using Microsoft.Extensions.Hosting;
=======
using System;
using Microsoft.Extensions.Logging;
>>>>>>>
using Microsoft.Extensions.Logging;
using System;
<<<<<<<
pub... |
<<<<<<<
namespace Nancy.Demo
{
using Nancy.Demo.Models;
using Nancy.Formatters;
using Nancy.ViewEngines;
using Nancy.ViewEngines.NDjango;
using Nancy.ViewEngines.NHaml;
using Nancy.ViewEngines.Razor;
=======
using Nancy.Demo.Models;
using Nancy.Formatters;
using Nancy.ViewEngines.Razor;
>>>>... |
<<<<<<<
=======
using System.Runtime.InteropServices;
>>>>>>>
<<<<<<<
[assembly: AssemblyVersion("0.0.0")]
=======
[assembly: AssemblyVersion("0.6.0")]
>>>>>>>
[assembly: AssemblyVersion("0.0.0")] |
<<<<<<<
var serializer = new JavaScriptSerializer(null, false, JsonSettings.MaxJsonLength, JsonSettings.MaxRecursions);
serializer.RegisterConverters(JsonSettings.Converters, JsonSettings.PrimitiveConverters);
=======
var serializer = new JavaScriptSerializer(null, false, JsonSetti... |
<<<<<<<
// TestCodeElements.Check_NOTCodeElements();
// TestCodeElements.Check_ONCodeElements();
// TestCodeElements.Check_PERFORMCodeElements();
=======
//TODO TestCodeElements.Check_NOTCodeElements();
//TODO TestCodeElements.Check_ONCodeElements();
... |
<<<<<<<
da.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
=======
... |
<<<<<<<
using System.Reflection;
=======
using Jabbot.Sprockets.Core;
using SignalR.Client.Hubs;
using SignalR.Client.Transports;
using JabbR.Client;
using JabbR.Client.Models;
>>>>>>>
using System.Reflection;
using JabbR.Client;
using JabbR.Client.Models;
<<<<<<<
private const string ExtensionsFolder = "S... |
<<<<<<<
=======
// Check if a dictionary item has been assigned
if (propertyValue == null || propertyValue.ToString().IsNullOrWhiteSpace())
{
var dictionaryValueAttr = propertyInfo.GetCustomAttribute<UmbracoDictionaryValueAttribute>()... |
<<<<<<<
// This contains the IPublishedContent and the currently converting property name.
var context = new PublishedContentContext(content, actualPropertyName);
=======
// This contain... |
<<<<<<<
CultureInfo culture,
object instance,
Action<DittoConversionHandlerContext> onConverting,
Action<DittoConversionHandlerContext> onConverted,
DittoChainContext chainContext)
=======
IDittoContextAccessor contextAccessor,
Cultu... |
<<<<<<<
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
CultureInfo culture = null)
=======
Action<ConvertingTypeEventArgs> convertingType = null,
Action<ConvertedTypeEventArgs> convertedTy... |
<<<<<<<
string snapshot;
if (queryParameters.TryGetValue(Constants.QueryConstants.ShareSnapshot, out snapshot))
{
if (!string.IsNullOrEmpty(snapshot))
{
parsedShareSnapshot = ParseSnapshotTime(snapshot);
}
... |
<<<<<<<
typeof (ClusterResponseParser<>),
typeof (TermsResponseParser<>)
=======
typeof (ClusterResponseParser<>),
typeof (InterestingTermsResponseParser<>),
typeof (MoreLikeThisHandlerMatchResponseParser<>),
>>>>>>>
type... |
<<<<<<<
builder.RegisterType<MappingValidator>().As<IMappingValidator>();
builder.RegisterType<SolrDictionarySerializer>().As<ISolrDocumentSerializer<Dictionary<string, object>>>();
builder.RegisterType<SolrDictionaryDocumentResponseParser>().As<ISolrDocumentResponseParse... |
<<<<<<<
if (!RTCore.Instance.ctrlLockAddon.IsLockSet())
RTCore.Instance.ctrlLockAddon.SetFullLock("RemoteTech");
=======
InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, "RTLockControlCamForWindows");
>>>>>>>
InputLockManager.SetControl... |
<<<<<<<
internal async Task UploadFromStreamAsyncHelper(Stream source, long? length, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
=======
internal Task UploadFromStreamAsyncHelper(Stream source, lon... |
<<<<<<<
/// <summary>
/// Load a preset config into the remotetech settings object.
/// </summary>
private static Settings LoadPreset(Settings settings, UrlDir.UrlConfig curSet)
{
settings.PreSets.Add(curSet.url);
RTLog.Notify("Override RTSettings with co... |
<<<<<<<
// Remove GUI stuff
GameEvents.onShowUI.Remove(UIOn);
GameEvents.onHideUI.Remove(UIOff);
=======
// addons
if (ctrlLockAddon != null) ctrlLockAddon = null;
if (kacAddon != null) kacAddon = null;
>>>>>>>
// Remove GUI stuff
... |
<<<<<<<
#else
ExecutionState<NullType> tempExecutionState = BlobCommonUtility.CreateTemporaryExecutionState(modifiedOptions);
#endif
return Task.Run(async () =>
{
Stream pageDataAsStream = pageData;
Stream seekableStream = pageDataAsStream;
... |
<<<<<<<
public static StorageRequestMessage AppendBlock(Uri uri, Uri sourceUri, long? offset, long? count, string sourceContentMd5, int? timeout, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition,
HttpContent content, OperationContext operationContext, ICanonicalizer canoni... |
<<<<<<<
using System;
using System.Collections.Generic;
=======
using System;
>>>>>>>
using System;
using System.Collections.Generic;
<<<<<<<
=======
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; }
>>>>>>>
[Attr("offset-date")]
public DateTimeOffset? Off... |
<<<<<<<
[Attr("calculated-value", isImmutable: true)]
public string CalculatedValue
{
get => "joe";
}
=======
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; }
>>>>>>>
[Attr("calculated-value", isImmutable: true)]
publ... |
<<<<<<<
public event EventHandler<GitHubNewContributorsEventArgs> Updated = null;
=======
>>>>>>> |
<<<<<<<
using Microsoft.Extensions.Options;
=======
using System;
>>>>>>>
using Microsoft.Extensions.Options;
<<<<<<<
private static ILogger Logger;
=======
>>>>>>>
<<<<<<<
ConfigureAspNetFeatures(services);
services.AddSingleton<IConfigureOptions<SignalrTagHelperOptions>, ConfigureSignalrTagHelperO... |
<<<<<<<
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _edgeHubClient);
await _edgeHubClient... |
<<<<<<<
// composite hologram onto video
BlitCompositeTexture(renderTexture, colorRGBTexture, compositeTexture);
=======
if (IsVideoRecordingQuadrantMode)
{
// Composite hologram onto video for recording quadrant mode video, or for previewing
... |
<<<<<<<
var prefix = IsSecureConnection() ? Constants.CdnSecurePrefix : Constants.CdnPrefix;
return FormatStyleVirtualPath(entry.ResourceName, minified).Replace("~/", prefix);
=======
var prefix = (IsSecureConnection() ? "https:" : "http:") + Constants.CdnPrefix;
... |
<<<<<<<
this.BlockBlobTier = other.BlockBlobTier;
this.PageBlobTier = other.PageBlobTier;
this.RehydrationStatus = other.RehydrationStatus;
=======
this.PremiumPageBlobTier = other.PremiumPageBlobTier;
>>>>>>>
this.PremiumPageBlobTier = other.PremiumPageBlo... |
<<<<<<<
public sealed class Loader : LoadingSystem
{
public static void init()
{
// log version
Lib.Log("version " + Lib.Version());
// parse settings
Settings.parse();
// parse profile
Profile.parse();
// detect features
Features.detect();
// get configs from DB
UrlDir.UrlFile r... |
<<<<<<<
=======
Signal = Lib.ConfigValue(cfg, "Signal", false);
if (Signal == true)
{
Lib.Log("Signal is enabled. This will likely be removed or re-worked in future version, so be warned.");
}
Deploy = Lib.ConfigValue(cfg, "Deploy", false);
>>>>>>>
Deploy = Lib.ConfigValue(cfg, "Deploy", false)... |
<<<<<<<
this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, sslProtocol, 0, null, null);
=======
this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, clientCert, sslProtocol, null, null);
>>>>>>>
this.Init(brokerIpAddress.ToString(), brokerPort, secure, ... |
<<<<<<<
/// <summary>
/// Generates a web request to set the tier for a blob.
/// </summary>
/// <param name="uri">A <see cref="System.Uri"/> specifying the absolute URI to the blob.</param>
/// <param name="timeout">The server timeout interval, in seconds.</param>
/// <... |
<<<<<<<
using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo;
=======
using MediaBrowser.Common.MediaInfo;
>>>>>>>
using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo; |
<<<<<<<
[SerializeField]
InspectorPreviewData m_PreviewData = new InspectorPreviewData();
=======
public IEnumerable<Guid> removedProperties
{
get { return m_RemovedProperties; }
}
#endregion
#region Node data
[NonSerialized]
Dicti... |
<<<<<<<
using System.Linq;
namespace Splunk.Client.UnitTests
=======
namespace Splunk.Client.UnitTesting
>>>>>>>
namespace Splunk.Client.UnitTests
<<<<<<<
=======
>>>>>>>
<<<<<<<
#endif
///// <summary>
///// Returns a value dermining whether a string is in the
///// non-ordered array ... |
<<<<<<<
using Splunk.Client;
using Splunk.Client.Helper;
=======
>>>>>>> |
<<<<<<<
=======
Console.WriteLine(" # of inputs={0}.", inputsConfiguration.Count);
stopwatch.Start();
>>>>>>>
Console.WriteLine(" # of inputs={0}.", inputsConfiguration.Count);
stopwatch.Start(); |
<<<<<<<
using System;
using System.IO;
using System.Net;
using System.Text.RegularExpressions;
using Splunk.Client;
using Splunk.Client.Helper;
=======
>>>>>>> |
<<<<<<<
this.labelListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.openUsageMapFile = new System.Windows.Forms.OpenFileDialog();
this.ColumnAlias = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPC = new System.Windows... |
<<<<<<<
aliasList = new AliasList(this);
=======
UpdatePanels();
>>>>>>>
aliasList = new AliasList(this);
UpdatePanels();
<<<<<<<
// sub windows
AliasList aliasList;
private void EnableSubWindows()
{
labelListToolStrip... |
<<<<<<<
public const int MaxNameLength = 50;
public const int MaxPhoneNumberLength = 11;
public const int MaxEmailAddressLength = 80;
public const int MaxAddressLength = 200;
=======
/// <summary>
/// 名字最大长度
/// </summary>
public const int MaxNam... |
<<<<<<<
[TestMethod]
public void TestFromLson01()
{
dynamic t = LuaTable.FromLson("{ a = true, b = false, c = 10, d = 1099511627776, e = 'test', f = 1.0, g = 1.23, h = 1e10 }");
TestResult(new LuaResult(t.a, t.b, t.c, t.d, t.e, t.f, t.g, t.h), true, false, 10, 1099511627776L, "test", 1.0, 1.23, 1e10);
}
... |
<<<<<<<
.AddWorkScopes("Doors", "Doors-Metal", "Here's a work scope Description")
.AddVendor("Doors")
.ClickBidRequests()
.CreateNewBidRequest("10", "13.99")
.ClickProposalTab()
... |
<<<<<<<
public bool GetSosOnlineContent()
{
if (SosOnlineAlwaysOffline) return false;
// if someone doesn't want to check for the lastest software, they probably are on a private network and don't want random connections to SoS Online
if (UpdateLocation != UpdateLoca... |
<<<<<<<
try
{
await CreateQueueAsync(namespaceManager, path, requiresSessions, maxDeliveryCount);
}
catch (MessagingEntityAlreadyExistsException)
{
await Task.FromResult(0);
}
... |
<<<<<<<
return this.StartCopy(source, default(StandardBlobTier?) /*standardBlockBlobTier*/, sourceAccessCondition, destAccessCondition, options, operationContext);
}
/// <summary>
/// Begins an operation to start copying another block blob's contents, properties, and metadata to thi... |
<<<<<<<
[FileType.Hps] = new Hps(),
=======
[FileType.Adx] = new Adx(),
>>>>>>>
[FileType.Hps] = new Hps(),
[FileType.Adx] = new Adx(), |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.