conflict_resolution
stringlengths
27
16k
<<<<<<< using MrCMS.Web.Apps.Ecommerce.Areas.Admin.Services; using MrCMS.Web.Apps.Ecommerce.Entities.Orders; ======= using MrCMS.Settings; using MrCMS.Web.Apps.Ecommerce.ACL; using MrCMS.Web.Apps.Ecommerce.Helpers; >>>>>>> using MrCMS.Web.Apps.Ecommerce.Areas.Admin.Services; using MrCMS.Web.Apps.Ecommerce.Entities.O...
<<<<<<< using MrCMS.Web.Apps.Ecommerce.Areas.Admin.Services; using MrCMS.Web.Apps.Ecommerce.Entities.Orders; ======= using MrCMS.Settings; using MrCMS.Web.Apps.Ecommerce.ACL; using MrCMS.Web.Apps.Ecommerce.Helpers; >>>>>>> using MrCMS.Web.Apps.Ecommerce.Areas.Admin.Services; using MrCMS.Web.Apps.Ecommerce.Entities.O...
<<<<<<< AmazonApiSection.Feeds, null, null, amazonListing, null); retryCount++; if (retryCount == 3) break; ======= AmazonApiSection.Feeds, null,null, amazonListing,null); >>>>>>> ...
<<<<<<< _amazonOrderRequestService.SubmitOrderFulfillmentFeed(feed); ======= var submissionId = _amazonOrderRequestService.SubmitOrderFulfillmentFeed(feed); foreach (var amazonOrder in shippedOrders) _amazonOrderService.MarkAsShipped(amazonOrder); //_am...
<<<<<<< using System.Collections.Generic; using System.Linq; using MrCMS.Web.Apps.Ecommerce.Entities; using MrCMS.Web.Apps.Ecommerce.Entities.Cart; using MrCMS.Web.Apps.Ecommerce.Entities.Shipping; using MrCMS.Web.Apps.Ecommerce.Entities.Users; using MrCMS.Web.Apps.Ecommerce.Models; using MrCMS.Website; ======= usi...
<<<<<<< using MrCMS.Web.Apps.Ecommerce.Entities.Users; using MrCMS.Web.Apps.Ecommerce.Helpers; using MrCMS.Web.Apps.Ecommerce.Models; using MrCMS.Website; using NHibernate; ======= >>>>>>> using MrCMS.Web.Apps.Ecommerce.Entities.Users; using MrCMS.Website; <<<<<<< public interface IOrderShippingService { ...
<<<<<<< AmazonApiSection.Feeds, null, null, amazonListing, null); retryCount++; if (retryCount == 3) break; ======= AmazonApiSection.Feeds, null,null, amazonListing,null); >>>>>>> ...
<<<<<<< ======= protected int mapstep; protected bool mapsaved; protected double[] mapline; protected CelestialBody body; public Texture2D map; protected float[,,] big_heightmap; public void setBody ( CelestialBody b ) { if (body == b) return; body = b; resetMap (); } public voi...
<<<<<<< var customConsumerGroupName = "cgroup1"; // Generate a new lease container name that will be used through out the test. string leaseContainerName = Guid.NewGuid().ToString(); var consumerGroupNames = new string[] { PartitionReceiver.DefaultConsumerGroupName, cus...
<<<<<<< public Server Server { get; set; } public string CodeVersion { get; set; } ======= public Server Server { get; set; } public string ProxyAddress { get; set; } >>>>>>> public Server Server { get; set; } public string CodeVersion { get; set; } public ...
<<<<<<< using System.Diagnostics; ======= using System.Collections.Generic; >>>>>>> using System.Diagnostics; using System.Collections.Generic;
<<<<<<< ======= public static SyntaxNode GetAncestor(this SyntaxToken token, Func<SyntaxNode, bool> predicate) { return token.GetAncestor<SyntaxNode>(predicate); } public static T GetAncestor<T>(this SyntaxToken token, Func<T, bool> predicate = null) where T : ...
<<<<<<< ======= using System.Xml.Serialization; using System.Xml.Schema; using System.Xml; using numl.Model; using numl.Utils; using numl.Features; using numl.Preprocessing; >>>>>>> using numl.Model; using numl.Utils; using numl.Features; using numl.Preprocessing; <<<<<<< ======= /// <summary>Converts an ...
<<<<<<< using System.Collections.Concurrent; ======= using System.Reflection; using System.Globalization; using numl.Platform; >>>>>>> using System.Collections.Concurrent; using System.Globalization; <<<<<<< t == typeof(int) || t == typeof(double) || t == typ...
<<<<<<< ======= System.Diagnostics.Debug.WriteLine("Starting new sweep!"); >>>>>>>
<<<<<<< /// <summary> /// Executes the compiler. /// </summary> /// <returns>True if the build task completes successfully. Otherwise, false.</returns> ======= public string BaseAddress { get; set; } public string LoadOf...
<<<<<<< [Required(ErrorMessage = "Debe especificar al menos un requisito."), Display(Name = "Requisitos para aplicar")] public string RequirementsToApply { get; set; } [Required(ErrorMessage = "El nombre de la empresa es requerido."), Display(Name = "Ubicación")] ======= public string...
<<<<<<< ======= public StoredEvent() { } >>>>>>>
<<<<<<< this.playerTeleported = new AsyncEvent<PlayerTeleportEventArgs>(HandleException, "PlayerTeleported"); ======= this.serverStatusRequest = new AsyncEvent<ServerStatusRequestEventArgs>(HandleException, "ServerStatusRequest"); >>>>>>> this.playerTeleported = new AsyncEvent<Pla...
<<<<<<< using Obsidian.Entities; using Obsidian.Serialization.Attributes; ======= using Obsidian.API; using Obsidian.Entities; using Obsidian.Net.Packets.Play.Clientbound; using Obsidian.Serializer.Attributes; >>>>>>> using Obsidian.API; using Obsidian.Entities; using Obsidian.Serialization.Attributes; using Obsi...
<<<<<<< using (var dataStream = new MinecraftStream()) { stream.semaphore.WaitOne(); await ComposeAsync(dataStream); ======= using var dataStream = new MinecraftStream(); await ComposeAsync(dataStream); >>>>>>> stream.semaph...
<<<<<<< (int playerChunkX, int playerChunkZ) = c.Player.Position.ToChunkCoord(); (int lastPlayerChunkX, int lastPlayerChunkZ) = c.Player.LastPosition.ToChunkCoord(); ======= (int playerChunkX, int playerChunkZ) = c.Player.Location.ToChunkCoord(); (int last...
<<<<<<< // Send commands // await this.SendDeclareCommandsAsync(); ======= >>>>>>>
<<<<<<< semaphore = new Semaphore(1, 1); ======= var oldStream = this.BaseStream; this.BaseStream = new CipherStream(oldStream, DecryptCipher, EncryptCipher); >>>>>>> semaphore = new Semaphore(1, 1); var oldStream = this.BaseStream; this.Base...
<<<<<<< [JsonProperty("logLevel")] #if DEBUG public LogLevel LogLevel = LogLevel.Debug; #else public LogLevel LogLevel = LogLevel.Error; #endif ======= [JsonProperty("debugMode")] public bool DebugMode = false; >>>>>>> [JsonProperty("logLevel")] #if DEBUG publ...
<<<<<<< using Obsidian.API.Plugins.Services.Common; using System.IO; ======= using System; using System.IO; >>>>>>> using Obsidian.API.Plugins.Services.Common; using System; using System.IO;
<<<<<<< await stream.WriteEntityMetdata(13, EntityMetadataType.OptPosition, this.BedBlockPosition, this.BedBlockPosition != default); } public override void Write(MinecraftStream stream) { base.Write(stream); stream.WriteEntityMetadataType(7, EntityMetadataT...
<<<<<<< public string Path => System.IO.Path.GetFullPath($"Server{Id}"); ======= public CommandService Commands { get; } public Config Config { get; } public AsyncLogger Logger { get; } public int Id { get; private set; } public string Version { get; } public in...
<<<<<<< using ContosoMoments.ViewModels; using Microsoft.WindowsAzure.MobileServices.Files; using Microsoft.WindowsAzure.MobileServices.Files.Sync; using PCLStorage; using System; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Xamarin.Forms; namespace ContosoMoments.Views { public p...
<<<<<<< using Foundation; using Microsoft.WindowsAzure.MobileServices; using Newtonsoft.Json.Linq; using System; using System.Threading.Tasks; using UIKit; namespace ContosoMoments.iOS { // The UIApplicationDelegate for the application. This class is responsible for launching the // User Interface of the app...
<<<<<<< ======= [EnableCors(origins: "*", headers: "*", methods: "*")] [Authorize] >>>>>>> [Authorize] <<<<<<< ======= [EnableCors(origins: "*", headers: "*", methods: "*")] [Authorize] >>>>>>> [Authorize] <<<<<<< ======= [EnableCors(origins: "*", header...
<<<<<<< using Microsoft.WindowsAzure.MobileServices.Files; using Microsoft.WindowsAzure.MobileServices.Files.Metadata; using Microsoft.WindowsAzure.MobileServices.Sync; using System.Threading.Tasks; namespace ContosoMoments { public interface IPlatform { Task<string> GetDataFilesPath(); Task<...
<<<<<<< using ContosoMoments.Common.Queue; using ContosoMoments.MobileServer.Models; ======= >>>>>>> using ContosoMoments.Common.Queue; using ContosoMoments.MobileServer.Models; <<<<<<< using System.Configuration; using System.Linq; using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.Controll...
<<<<<<< ======= using ContosoMoments.Common.Models; using Microsoft.Azure.Mobile.Server; using System.Configuration; using System; using System.Net.Http; using System.Diagnostics; >>>>>>> using ContosoMoments.Common.Models; using Microsoft.Azure.Mobile.Server; using System.Configuration; using System; using System.N...
<<<<<<< using System.Runtime.InteropServices; using System.Text; using System.Xml.Linq; ======= >>>>>>> <<<<<<< public void AddDiagnosis(string diagnosisUid, DateTimeOffset submissionDate) { var existing = PositiveDiagnoses?.Where(d => d.DiagnosisUid.Equals(diagnosisUid, StringComparison.OrdinalIgnoreCase)) ...
<<<<<<< var dom = parser.ParseDocument("<html><body></body></html>"); dom.Body.InnerHtml = html; ======= var dom = parser.Parse("<html><body>" + html); >>>>>>> var dom = parser.ParseDocument("<html><body>" + html); <<<<<<< DoSanitize(dom, dom.DocumentEleme...
<<<<<<< using Newtonsoft.Json; using Newtonsoft.Json.Linq; ======= using Microsoft.Quantum.QsCompiler.SyntaxTokens; using Microsoft.Quantum.QsCompiler.SyntaxTree; >>>>>>> using Microsoft.Quantum.QsCompiler.SyntaxTokens; using Microsoft.Quantum.QsCompiler.SyntaxTree; using Newtonsoft.Json; using Newtonsoft.Json.Linq;...
<<<<<<< <<<<<<< HEAD protected Logger _log = LogManager.GetCurrentClassLogger(); ======= >>>>>>> 3dd34e76b2bd5c60a3431e8f5fa66de0154cca6c ======= >>>>>>> protected Logger _log = LogManager.GetCurrentClassLogger(); <<<<<<< AppInfo = new ApplicationInfo(Config.Id, Assembly.GetEntryAssembly())...
<<<<<<< <<<<<<< HEAD Project: ServiceBusMQ.Adapter.NServiceBus4.Azure.SB22 ======= Project: ServiceBusMQ.NServiceBus4.Azure >>>>>>> Project: ServiceBusMQ.Adapter.NServiceBus4.Azure.SB22 <<<<<<< Created: 2013-11-30 ======= Project: ServiceBusMQ.NServiceBus4.Azure File: AzureMessageQueue.cs Created: ...
<<<<<<< <<<<<<< HEAD using NLog; ======= >>>>>>> using NLog; <<<<<<< <<<<<<< HEAD public void Purge() { var q = Main; //QueueClient.CreateFromConnectionString(_connectionStr, Queue.Name, ReceiveMode.ReceiveAndDelete); ======= internal void Purge() { var q = QueueClient.CreateFromConnect...
<<<<<<< **`dump.measurementDisplayStyle`** **Value:** '""NumberOnly""' , `""BarOnly""`, `""BarAndNumber""` (default), or `""None""` Configures the measurement probability visualization style in output of callables such as `DumpMachine` ...
<<<<<<< <<<<<<< HEAD namespace ServiceBusMQ.Adapter.Azure.ServiceBus22 { ======= namespace ServiceBusMQ.NServiceBus4.Azure { >>>>>>> 3dd34e76b2bd5c60a3431e8f5fa66de0154cca6c ======= namespace ServiceBusMQ.NServiceBus4.Azure { >>>>>>> namespace ServiceBusMQ.Adapter.Azure.ServiceBus22 { <<<<<<< <<<<<<< HEAD var...
<<<<<<< <<<<<<< HEAD using System.Threading.Tasks; ======= >>>>>>> 3dd34e76b2bd5c60a3431e8f5fa66de0154cca6c ======= >>>>>>> using System.Threading.Tasks; <<<<<<< <<<<<<< HEAD namespace ServiceBusMQ.Adapter.NServiceBus4.Azure.SB22 { ======= namespace ServiceBusMQ.NServiceBus4.Azure { >>>>>>> 3dd34e76b2bd5c60a3431e8f...
<<<<<<< <<<<<<< HEAD namespace ServiceBusMQ.Adapter.Azure.ServiceBus22 { ======= namespace ServiceBusMQ.NServiceBus4.Azure { >>>>>>> 3dd34e76b2bd5c60a3431e8f5fa66de0154cca6c ======= namespace ServiceBusMQ.NServiceBus4.Azure { >>>>>>> namespace ServiceBusMQ.Adapter.Azure.ServiceBus22 { <<<<<<< <<<<<<< HEAD ======= ...
<<<<<<< <<<<<<< HEAD using System.Threading; using System.Threading.Tasks; ======= >>>>>>> 3dd34e76b2bd5c60a3431e8f5fa66de0154cca6c ======= >>>>>>> using System.Threading; using System.Threading.Tasks; <<<<<<< <<<<<<< HEAD namespace ServiceBusMQ.Adapter.Azure.ServiceBus22 { ======= namespace ServiceBusMQ.NServiceBu...
<<<<<<< /// <summary> /// Tests <see cref="CommandLine.Arguments.GetArgumentHelp"/> with no arguments. /// </summary> [Fact] public void GetArgumentHelpNull() { #pragma warning disable CS0618 // Type or member is obsolete var help = CommandLine.Arguments.G...
<<<<<<< // Carry out initial population of information InvokeUpdateProfile(ref state, ref shortIntValues, ref textValues, ref intValues, ref decimalValues, ref booleanValues, ref dateTimeValues, ref extendedValues); InvokeNewSystem(ref state, ref s...
<<<<<<< using System.Linq; ======= using System.IO; >>>>>>> using System.Linq; using System.IO; <<<<<<< [TestMethod] public void TestBlueprintFromEdNameAndGrade() { string blueprintName = "WakeScanner_Fast Scan_3"; string blueprintTemplate = "Sensor_FastScan"; ...
<<<<<<< using EddiCore; ======= using System.Text; using EddiDataProviderService; using EddiStarMapService; using Newtonsoft.Json.Linq; using Tests.Properties; using Utilities; >>>>>>> using EddiCore; using System.Text; using EddiDataProviderService; using EddiStarMapService; using Newtonsoft.Json.Linq; using Tests....
<<<<<<< Assert.AreEqual(0.94775, (double)theEvent.solarradius, 0.01); ======= Assert.AreEqual(theEvent.radius, (decimal)659162816.0); Assert.AreEqual(theEvent.solarradius, StarClass.solarradius((decimal)659162816.000000)); >>>>>>> Assert.AreEqual(theEvent.radius, (deci...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using System.Collections.Generic; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< using System.ComponentModel.Composition; using Microsoft.R.Components.ContentTypes; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System.ComponentModel.Composition; >>>>>>> // Copyrigh...
<<<<<<< var dte = _coreShell.GetService<DTE>(); if (dte.Solution.Projects.Count > 0) { ======= DTE dte = VsAppShell.Current.GetGlobalService<DTE>(); var projects = dte?.Solution?.Projects; if (projects != null && projects.Count > 0) { >>>>>>> va...
<<<<<<< public Task<PlotDeviceProperties> PlotDeviceCreate(Guid deviceId, CancellationToken ct) { if (PlotDeviceCreateHandler != null) { return Task.FromResult(PlotDeviceCreateHandler(deviceId)); } throw new NotImplementedException(); } publi...
<<<<<<< new ShowContextMenuCommand(textView, RGuidList.RPackageGuid, RGuidList.RCmdSetGuid, (int)RContextMenuId.RHistory), new LoadHistoryCommand(textView, _historyProvider, _interactiveWorkflow), new SaveHistoryCommand(textView, _historyProvider, _interactiveWorkflow), ...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using System.Linq; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights rese...
<<<<<<< text.Should().Contain(string.Format(Microsoft.R.Components.Resources.InputIsTooLong, 4096)); ======= text.Should().Contain(string.Format(Resources.InputIsTooLong, 4096)); tb.Clear(); >>>>>>> text.Should().Contain(string.Format(Mi...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< using System; using Microsoft.R.Components.ContentTypes; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // L...
<<<<<<< CancellationTokenSource evaluationCts; Task evaluationTask; if (isEvaluationAllowed) { evaluationCts = new CancellationTokenSource(); evaluationTask = EvaluateUntilCancelled(contexts, evaluationCts.Token, ct); // will raise Mutate ...
<<<<<<< using System.ComponentModel.Composition; using Microsoft.R.Components.ContentTypes; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System.ComponentModel.Composition; using Microsoft.R.Edi...
<<<<<<< ======= using Microsoft.VisualStudio.R.Package.Debugger.Commands; using Microsoft.VisualStudio.R.Package.Documentation; >>>>>>> using Microsoft.VisualStudio.R.Package.Debugger.Commands; using Microsoft.VisualStudio.R.Package.Documentation; <<<<<<< new LoadWorkspaceCommand(interactiveWorkflow...
<<<<<<< using Microsoft.Common.Core.Enums; using Microsoft.R.Components.Settings; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using Microsoft.Common.Core.Enums; >>>>>>> // Copyright (c) Microsoft ...
<<<<<<< using System.Windows.Input; using Microsoft.Languages.Editor.Controller; ======= using System.Linq; using System.Windows; using System.Windows.Input; using Microsoft.Languages.Editor; >>>>>>> using System.Linq; using System.Windows; using System.Windows.Input; <<<<<<< using Microsoft.Languages.Editor.Ser...
<<<<<<< using Microsoft.Common.Core.Shell; ======= using Microsoft.Common.Core.Tasks; >>>>>>> using Microsoft.Common.Core.Shell; using Microsoft.Common.Core.Tasks; <<<<<<< IColorService ColorService { get; } ======= ITaskService Tasks { get; } >>>>>>> ITaskService Tasks { get; } I...
<<<<<<< protected override IClassifier CreateClassifier(ITextBuffer textBuffer, IClassificationTypeRegistryService crs, IContentTypeRegistryService ctrs, IEnumerable<Lazy<IClassificationNameProvider, IComponentContentTypes>> ClassificationNameProviders) { var classifier = ServiceManager.GetService<M...
<<<<<<< using System.ComponentModel.Composition; using Microsoft.R.Components.ContentTypes; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System.ComponentModel.Composition; >>>>>>> // Copyrigh...
<<<<<<< using Microsoft.R.Host.Client.Host; ======= using Microsoft.R.Host.Client.Extensions; >>>>>>> using Microsoft.R.Host.Client.Extensions; using Microsoft.R.Host.Client.Host; <<<<<<< await _interactiveWorkflow.RSession.ExportToBitmapAsync(deviceName, outputFilePath, _lastPixelWidth, _lastPixelH...
<<<<<<< [ProvideCodeExpansions(RGuidList.RLanguageServiceGuidString, false, 0, RContentTypeDefinition.LanguageName, @"Snippets\SnippetsIndex.xml")] [ProvideCodeExpansionPath(RContentTypeDefinition.LanguageName, "analysis", @"Snippets\analysis")] [ProvideCodeExpansionPath(RCo...
<<<<<<< replWindow.EnqueueCode(text, addNewLine); ======= ReplWindow.Show(); replWindow.InsertCodeMaybeExecute(text, addNewLine); >>>>>>> ReplWindow.Show(); replWindow.EnqueueCode(text, addNewLine);
<<<<<<< struct MessagePos { public string Message; public int Position; } private readonly ConcurrentStack<MessagePos> _messageStack = new ConcurrentStack<MessagePos>(); ======= private volatile string _lastMessage; private int _lastPosition = -1; >>>...
<<<<<<< Process = new ProcessServices(); ======= ProcessServices = processServices; >>>>>>> Process = new ProcessServices(); <<<<<<< Process = ps; Registry = registry; ======= ProcessServices = ps; >>>>>>> Process = ps; <<<<<<< ...
<<<<<<< using System.Windows; ======= using System.Drawing; using System.IO; using System.Reflection; using System.Threading; >>>>>>> using System.Drawing; using System.IO; using System.Reflection; using System.Windows; <<<<<<< ======= using System.Windows.Threading; using Microsoft.Common.Core; >>>>>>> using Mi...
<<<<<<< using System; using System.Diagnostics.CodeAnalysis; using System.Reflection; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System.Diagnostics.CodeAnalysis; using System.Threading; >>>>...
<<<<<<< /// Looks up a localized string similar to Surround With. /// </summary> public static string SurroundWith { get { return ResourceManager.GetString("SurroundWith", resourceCulture); } } /// <summary> ======= ///...
<<<<<<< using Microsoft.R.Components.InteractiveWorkflow; using Microsoft.R.Host.Client; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using Microsoft.R.Host.Client; >>>>>>> // Copyright (c) Microso...
<<<<<<< using System; using System.Collections.Generic; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< private const string Ns = "http://schemas.microsoft.com/winfx/2006/xaml/presentation"; private const string SetupCode = @" xaml <- function(filename, width, height) { .External('rtvs::External.xaml_graphicsdevice_new', filename, width, height)} ======= private const string ns = "http:/...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using System.Text; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights rese...
<<<<<<< /// Looks up a localized string similar to R Plot - Locator is Active. /// </summary> public static string PlotWindowCaptionLocatorActive { get { return ResourceManager.GetString("PlotWindowCaptionLocatorActive", resourceCulture); } } ...
<<<<<<< using Microsoft.Languages.Editor; ======= using Microsoft.Languages.Editor.Extensions; using Microsoft.Languages.Editor.Text; >>>>>>> using Microsoft.Languages.Editor.Extensions; using Microsoft.Languages.Editor.Text; using Microsoft.Languages.Editor;
<<<<<<< public HostLoadIndicatorViewModelTest(RComponentsShellProviderFixture shellProvider) { _coreShell = shellProvider.CoreShell; } [Test] public async Task Update() { ======= [Test(ThreadType.UI)] public void Update() { >>>>>>> public HostLoadI...
<<<<<<< return _interactiveWorkflow.ActiveWindow != null ? CommandStatus.SupportedAndEnabled : CommandStatus.Supported; ======= if (ReplWindow.ReplWindowExists) { return CommandStatus.SupportedAndEnabled; } return CommandStatus.Invisible; >>>>>>> ...
<<<<<<< using System; ======= // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; using Microsoft.Languages.Editor; >>>>>>> // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed u...
<<<<<<< Task PingAsync(); ======= AboutHost AboutHost { get; } >>>>>>> AboutHost AboutHost { get; } Task PingAsync();
<<<<<<< this.contextMenuStripAssets.Size = new System.Drawing.Size(350, 408); ======= this.contextMenuStripAssets.Size = new System.Drawing.Size(350, 414); >>>>>>> this.contextMenuStripAssets.Size = new System.Drawing.Size(350, 414); <<<<<<< private System.Windows.Forms.T...
<<<<<<< Task.Factory.StartNew(() => ProcessUploadFileAndMore(file, response.Id, Properties.Settings.Default.useStorageEncryption ? AssetCreationOptions.StorageEncrypted : AssetCreationOptions.None, response.token), response.token); DotabControlMainSwitch(AMSExplorer.Properties.Re...
<<<<<<< /// <summary> /// Ssl cipher. /// </summary> public class SslCipher : Base, IStackable ======= class SslCipher : BaseReference<SslCipher>, IStackable >>>>>>> public class SslCipher : BaseReference<SslCipher>, IStackable <<<<<<< // SSL_CIPHERs come from a static list in ssl_ciph.c // nothing to d...
<<<<<<< InputProtocol = c.Input.StreamingProtocol, Encoding = c.EncodingType != ChannelEncodingType.None ? EncodingImage : null, IngestUrl = c.Input.Endpoints.FirstOrDefault().Url, ======= Input...
<<<<<<< private void withAzureMediaPlayerToolStripMenuItem_Click(object sender, EventArgs e) { if (IsAssetCanBePlayed(ReturnSelectedAssets().FirstOrDefault(), ref PlayBackLocator)) AssetInfo.DoPlayBackWithBestStreamingEndpoint(PlayerType.AzureMediaPlayer, PlayBackLocator.Get...
<<<<<<< DGChannel.Rows.Add(string.Format(AMSExplorer.Properties.Resources.ChannelInformation_ChannelInformation_Load_PreviewURL0, endpoint.Protocol), endpoint.Url); ======= foreach (var endpoint in MyChannel.Preview.Endpoints) { DGCha...
<<<<<<< CDNIndexHandler.Cache.Enabled = flags.UseCache; CDNIndexHandler.Cache.CacheData = flags.CacheData; CDNIndexHandler.Cache.Validate = flags.ValidateCache; CASCConfig config = null; // ngdp:us:pro // http:us:pro:us.patch.battle.net:1119 ...
<<<<<<< public IList<Measurement> AllMeasurements { get; } public GcStats GcStats { get; } ======= public IReadOnlyList<Measurement> AllMeasurements { get; } >>>>>>> public IReadOnlyList<Measurement> AllMeasurements { get; } public GcStats GcStats { get; } <<<<<<< ...
<<<<<<< ======= public static void ExportToFile(IBenchmarkExporter exporter, IList<BenchmarkReport> reports, string competitionName, IEnumerable<IBenchmarkResultExtender> resultExtenders = null) { using (var stream = new StreamWriter(competitionName...
<<<<<<< public SetupAttributeTest(ITestOutputHelper output) : base(output) { } ======= private const string SetupCalled = "// ### Setup called ###"; private const string BenchmarkCalled = "// ### Benchmark called ###"; >>>>>>> private const string SetupCalled = "// ### Setup called ...
<<<<<<< using BenchmarkDotNet.Helpers; using BenchmarkDotNet.Horology; ======= >>>>>>> using BenchmarkDotNet.Horology; <<<<<<< public void Foo() { } [Benchmark] public void Bar() { } } public class MockHostEnvironm...
<<<<<<< public string From { get; } ======= [JsonConverter(typeof(KeyPairTypeAdapter))] public KeyPair From { get; private set; } >>>>>>> public string From { get; private set; } <<<<<<< public string To { get; } ======= [JsonConverter(typeof(KeyPairTypeAdapter))] ...
<<<<<<< public string Trustor { get; } ======= [JsonConverter(typeof(KeyPairTypeAdapter))] public KeyPair Trustor { get; private set; } >>>>>>> public string Trustor { get; private set; } <<<<<<< public string Trustee { get; } ======= [JsonConverter(typeof(KeyPairTy...