conflict_resolution
stringlengths
27
16k
<<<<<<< public VixenPreviewData Data { set { if (value == null) { VixenSystem.Logging.Warning("VixenPreviewDisplay: Data set as null! (Thread ID: " + System.Threading.Thread.CurrentThread.ManagedThreadId + ")"); } ======= public VixenPreviewData Data { set { if (value == nu...
<<<<<<< public Element _workingElement; //This is the element that was left clicked, is set to null on mouse up ======= >>>>>>> public Element _workingElement; //This is the element that was left clicked, is set to null on mouse up
<<<<<<< Logging.ErrorException("TimedSequenceEditor: <LoadSequence> - Error loading sequence.", ee); ======= Logging.Error("Error loading sequence.", ee); >>>>>>> Logging.Error("TimedSequenceEditor: <LoadSequence> - Error loading sequence.", ee); <<<<<<< Logging.ErrorException("TimedSequenceEditor: ...
<<<<<<< this.allowItemEditCheckBox = new TQVaultAE.GUI.ScalingCheckBox(); this.allowItemCopyCheckBox = new TQVaultAE.GUI.ScalingCheckBox(); this.skipTitleCheckBox = new TQVaultAE.GUI.ScalingCheckBox(); this.loadLastCharacterCheckBox = new TQVaultAE.GUI.ScalingCheckBox(); this.loadLastVaultCheckBox = new ...
<<<<<<< ======= #if FEATURE_WPF //This test requires PresentationCore.dll (specified in Configuration2/config_with_using_assembly.xml) >>>>>>> #if FEATURE_WPF //This test requires PresentationCore.dll (specified in Configuration2/config_with_using_assembly.xml)
<<<<<<< using System.Linq.Expressions; using System.Threading; using System.Threading.Tasks; ======= >>>>>>> using System.Threading; using System.Threading.Tasks; <<<<<<< var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null); ======...
<<<<<<< if (classServices.Length != 1) ======= if (classServices.Count() != 1) >>>>>>> if (classServices.Count() != 1) <<<<<<< var classService = classServices[0]; ======= var classService = classServices.Single(); >>>>>>> var classService = classServices.Single(); <<<<<<< if (registration...
<<<<<<< if (classServices.Length != 1) ======= if (classServices.Count() != 1) >>>>>>> if (classServices.Count() != 1) <<<<<<< var classService = classServices[0]; ======= var classService = classServices.Single(); >>>>>>> var classService = classServices.Single(); <<<<<<< if (registration...
<<<<<<< private readonly Func<IKernel, CreationContext, T> creator; ======= public FactoryMethodActivator(ComponentModel model, IKernel kernel, ComponentInstanceDelegate onCreation, ComponentInstanceDelegate onDestruction) : base(model, kernel, onCreation, onDestruction) { } >>>>>>> private readonly Fu...
<<<<<<< var service = serverAsClient.Resolve<ICalcService>(); ======= ICalcService service = (ICalcService) clientContainer.Resolve("calc.service.c1"); >>>>>>> var service = serverAsClient.Resolve<ICalcService>(); <<<<<<< ======= public void ServerClientContainerConsumingRemoteComponentCallback() ...
<<<<<<< using System.Reflection; ======= using System.Text; >>>>>>> using System.Reflection; using System.Text; <<<<<<< ======= public string Dump(string tab) { StringBuilder dump = new StringBuilder(); dump.AppendLine($"{tab}({Name} ["); Children.Fo...
<<<<<<< protected readonly IList<ISortInformation> _sortInformation; ======= protected readonly IFilter _subqueryFilter; protected readonly IList<SortInformation> _sortInformation; >>>>>>> protected readonly IFilter _subqueryFilter; protected readonly IList<ISortInformation> _sortInformation; <<...
<<<<<<< using MediaPortal.Backend.MediaLibrary; ======= using HttpServer.Sessions; >>>>>>> using MediaPortal.Backend.MediaLibrary; using HttpServer.Sessions;
<<<<<<< ======= HttpParam httpParam = request.Param; string identifier = httpParam["identifier"].Value; string hls = httpParam["hls"].Value; string file = httpParam["file"].Value; >>>>>>> <<<<<<< string hlsFile = Path.Combine(streamItem.TranscoderObject.SegmentDir, fileName); ...
<<<<<<< private List<CodecInfo> _disabledCodecs = null; ======= private CodecInfo _splitter = null; >>>>>>> private CodecInfo _splitter = null; private List<CodecInfo> _disabledCodecs = null;
<<<<<<< NfoMovieReader nfoReader = new NfoMovieReader(_debugLogger, miNumber, importOnly, forceQuickMode, isStub, _httpClient, _settings); ======= var nfoReader = new NfoMovieReader(_debugLogger, miNumber, false, importOnly, forceQuickMode, _httpClient, _settings); >>>>>>> NfoMovieReader nfoR...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; using MediaPortal.Plugins.MP2Extended.MAS; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; using MediaPortal.Plugins.MP2Extended.MAS.FileSystem; using MediaPortal.Plugins.MP2Extended.Extensions; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< base(PersonAspect.ROLE_COMPOSER, AudioAspect.ROLE_TRACK, Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS, new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending)) ======= base(Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS, new Sort...
<<<<<<< #region Copyright (C) 2007-2012 Team MediaPortal /* Copyright (C) 2007-2012 Team MediaPortal http://www.team-mediaportal.com This file is part of MediaPortal 2 MediaPortal 2 is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as pu...
<<<<<<< using MediaPortal.UI.Players.Video.Native; ======= using MediaPortal.Common.UserManagement; using MediaPortal.Common.UserProfileDataManagement; >>>>>>> using MediaPortal.UI.Players.Video.Native; using MediaPortal.Common.UserManagement; using MediaPortal.Common.UserProfileDataManagement;
<<<<<<< using System.Reflection; using System.Threading; ======= using System.Reflection; using System.Threading; using System.Drawing.Imaging; using System.Drawing; using System.Globalization; >>>>>>> using System.Reflection; using System.Threading; <<<<<<< ======= using MediaPortal.Utilities.SystemAPI; using Me...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; using MediaPortal.Plugins.MP2Extended.Extensions; using MediaPortal.Plugins.MP2Extended.MAS; using MediaPortal.Plugins.MP2Extended.MAS.General; using MediaPortal.Plugins.MP2Extended.MAS.Movie; using MediaPo...
<<<<<<< ======= using MediaPortal.Common.MediaManagement; using MediaPortal.Common.MediaManagement.DefaultItemAspects; using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; using MediaPortal.Plugins.MP2Extended.Extensions; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attrib...
<<<<<<< using MediaPortal.Backend.ClientCommunication; using MediaPortal.Common.Async; using MediaPortal.Common.Services.GenreConverter; ======= using IChannel = MediaPortal.Plugins.SlimTv.Interfaces.Items.IChannel; using ILogger = MediaPortal.Common.Logging.ILogger; using IPathManager = MediaPortal.Common.PathManage...
<<<<<<< using System.Linq; using MediaPortal.UiComponents.Media.Helpers; ======= using MediaPortal.UiComponents.Media.Settings; using System; using System.Collections.Generic; using System.Linq; >>>>>>> using MediaPortal.UiComponents.Media.Settings; using System; using System.Collections.Generic; using System.Linq; ...
<<<<<<< dd.CloseCallback(dd.DialogScreen.Name, dd.DialogInstanceId); CompleteDialogClosures(); ======= dd.CloseCallback(dd.DialogScreen.ResourceName, dd.DialogInstanceId); >>>>>>> dd.CloseCallback(dd.DialogScreen.ResourceName, dd.DialogInstanceId); CompleteDialogClosures();
<<<<<<< lock (_syncObj) { ShareWatcher watcher = new ShareWatcher(share, this, false); _shareWatchers.Add(share.ShareId, watcher); _shareDeleteSync.Add(share.BaseResourcePath, new object()); } ======= >>>>>>> <<<<<<< lock (_syncObj) { ...
<<<<<<< ======= if (result != null && !result.IsAllocated) { _imageSourceSetup = false; result.Allocate(); //FIXME: this breaks asynch loading, because FallbackSource is used before the load finishes. // better solution would be to show FallbackSource _while_ loading...
<<<<<<< AttributeSortInformation attributeSort = sortInformation as AttributeSortInformation; if (attributeSort != null) { if (attributeSort.AttributeType.ParentMIAM.IsTransientAspect) continue; if (!Include(attributeSort.AttributeType.ParentMIAM)) ...
<<<<<<< public NfoMovieReader(ILogger debugLogger, long miNumber, bool importOnly, bool forceQuickMode, bool readFileDetails, HttpClient httpClient, NfoMovieMetadataExtractorSettings settings) ======= public NfoMovieReader(ILogger debugLogger, long miNumber, bool videoOnly, bool importOnly, bool forceQuickMod...
<<<<<<< /// See comments on <see cref="ObjectContext"/> class. /// </summary> public virtual Task<int> ExecuteStoreCommandAsync(string commandText, CancellationToken cancellationToken, params object[] parameters) { throw new NotImplementedException(); } /// <...
<<<<<<< public bool MatchSeries(string folderOrFileName, out SeriesInfo seriesInfo, ref IDictionary<Guid, IList<MediaItemAspect>> extractedAspectData) ======= public bool MatchSeries(ILocalFsResourceAccessor folderOrFileLfsra, out SeriesInfo seriesInfo, ref IDictionary<Guid, MediaItemAspect> extractedAspectDa...
<<<<<<< using System; using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles; ======= using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles; using MediaPortal.Plugins.Transcoding.Service.Transcoders.Base; using System; using System.Collections.Generic; using System.Diagnostics.Eventing.Reader...
<<<<<<< base(AudioAlbumAspect.ROLE_ALBUM, AudioAspect.ROLE_TRACK, Consts.NECESSARY_ALBUM_MIAS, Consts.OPTIONAL_ALBUM_MIAS, new AttributeSortInformation(AudioAlbumAspect.ATTR_ALBUM, SortDirection.Ascending)) ======= base(Consts.NECESSARY_ALBUM_MIAS, Consts.OPTIONAL_ALBUM_MIAS, new SortInfor...
<<<<<<< ======= using HttpServer.Exceptions; using HttpServer.Sessions; >>>>>>> using HttpServer.Sessions;
<<<<<<< ======= using HttpServer.Exceptions; using HttpServer.Sessions; >>>>>>> using HttpServer.Sessions;
<<<<<<< // For supporting CC // AddClosedCaptionsFilter(); ======= >>>>>>> // AddClosedCaptionsFilter();
<<<<<<< using MediaPortal.UiComponents.Media.Helpers; ======= using MediaPortal.UiComponents.Media.Settings; using MediaPortal.UiComponents.Media.FilterTrees; >>>>>>> using MediaPortal.UiComponents.Media.Helpers; using MediaPortal.UiComponents.Media.FilterTrees; <<<<<<< protected IFilter _filter; protected ...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; using MediaPortal.Plugins.MP2Extended.Extensions; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< ======= public override bool CreateScheduleDetailed(IChannel channel, string title, DateTime from, DateTime to, ScheduleRecordingType recordingType, int preRecordInterval, int postRecordInterval, string directory, int priority, out ISchedule schedule) { IScheduleService scheduleService = GlobalS...
<<<<<<< ======= command.CommandText = SELECT_MEDIAITEM_ID_FROM_PATH_SQL; >>>>>>> <<<<<<< command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL; ======= command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL; >>>>>>> command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL; <<<<<<< ...
<<<<<<< #region Copyright (C) 2007-2012 Team MediaPortal /* Copyright (C) 2007-2012 Team MediaPortal http://www.team-mediaportal.com This file is part of MediaPortal 2 MediaPortal 2 is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as pu...
<<<<<<< protected AbstractProperty _groupingValueProviderProperty; ======= protected AbstractProperty _restoreFocusProperty; >>>>>>> protected AbstractProperty _groupingValueProviderProperty; protected AbstractProperty _restoreFocusProperty; <<<<<<< public AbstractProperty ItemsCountProperty ...
<<<<<<< base(CompanyAspect.ROLE_MUSIC_LABEL, AudioAlbumAspect.ROLE_ALBUM, Consts.NECESSARY_COMPANY_MIAS, Consts.OPTIONAL_COMPANY_MIAS, new AttributeSortInformation(CompanyAspect.ATTR_COMPANY_NAME, SortDirection.Ascending)) ======= base(Consts.NECESSARY_COMPANY_MIAS, Consts.OPTIONAL_COMPANY_MIAS, ...
<<<<<<< Label m_PathLabel; TextField m_PathLabelTextField; bool m_EditPathCancelled = false; public Action onDragFinished { get { return m_WindowDraggable.OnDragFinished; } set { m_WindowDraggable.OnDragFinished = value; } } ======= //pu...
<<<<<<< using MediaPortal.Plugins.MediaServer.Profiles; using MediaPortal.Plugins.Transcoding.Service; using MediaPortal.Utilities.Network; ======= using MediaPortal.Plugins.Transcoding.Service.Objects; >>>>>>> using MediaPortal.Plugins.MediaServer.Profiles; using MediaPortal.Plugins.Transcoding.Service; using Media...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.MAS.General; using MediaPortal.Plugins.MP2Extended.TAS; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< ======= using MediaPortal.Common.MediaManagement; using MediaPortal.Common.MediaManagement.DefaultItemAspects; using MediaPortal.Plugins.MP2Extended.Attributes; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< public FilterByActorCriterion(Guid linkedRole) : base(PersonAspect.ROLE_ACTOR, linkedRole, Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS, new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending)) ======= public FilterByActorCriterion() : base...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< public AudioSortByAlbum() : base(Consts.RES_SORT_BY_ALBUM, Consts.RES_GROUP_BY_ALBUM, AudioAspect.ATTR_ALBUM) { _includeMias = new[] { AudioAspect.ASPECT_ID }; } ======= public AudioSortByAlbum() : base(Consts.RES_SORT_BY_ALBUM, Consts.RES_GROUP_BY_ALBUM, new[] { AudioAspect.ATTR_ALBUM, ...
<<<<<<< TranscoderBinPath = ServiceRegistration.Get<IFFMpegLib>().FFMpegBinaryPath; ======= TranscoderBinPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "ffmpeg.exe"); AllowIntelHWAccelleration = false; AllowNvidiaHWAccelleration = false; >>>>>>> Tra...
<<<<<<< ======= using MediaPortal.Plugins.MP2Extended.Attributes; using MediaPortal.Plugins.MP2Extended.Common; >>>>>>> using MediaPortal.Plugins.MP2Extended.Attributes;
<<<<<<< Factory?.UpdateDockable(value, this); ======= _factory?.UpdateDockable(value, this); value.OnSelected(); >>>>>>> Factory?.UpdateDockable(value, this); value.OnSelected();
<<<<<<< Factory?.UpdateDockable(value, this); ======= _factory?.UpdateDockable(value, this); value.OnSelected(); >>>>>>> Factory?.UpdateDockable(value, this); value.OnSelected();
<<<<<<< ======= using System.IO; using System.Net; using System.Net.Http.Headers; >>>>>>> using System.IO; <<<<<<< // Handle CORS issue if (request.Method == HttpMethods.Options) { response.StatusCode = StatusCodes.Status200OK; ...
<<<<<<< mat = new Material(Shader.Find("GLTFUtility/Standard (Metallic)")); mat.color = baseColorFactor; mat.SetFloat("_Metallic", metallicFactor); mat.SetFloat("_Glossiness", 1 - roughnessFactor); ======= Shader sh = null; #if UNITY_2019_1_OR_NEWER // LWRP support if (GraphicsSettings.ren...
<<<<<<< // Copyright 2004-2010 Castle Project - http://www.castleproject.org/ // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0...
<<<<<<< // <inheritdoc /> [Obsolete("The queries are now streaming by default")] ======= /// <inheritdoc /> [Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")] >>>>>>> // <inheritdoc /> ...
<<<<<<< /// <summary> /// Creates a graph /// </summary> /// <param name="name">Name of the graph</param> /// <param name="edgeDefinitions">If true then the data is synchronised to disk before returning from a document create, update, replace or removal operation</param> ...
<<<<<<< AllEdges=5, Collection=6, Graph=7 ======= AllEdges = 5, Collection = 6, Transaction = 7 >>>>>>> AllEdges=5, Collection=6, Graph=7, Transaction = 8 <<<<<<< {CommandApi.Collection,"collection"}, {Co...
<<<<<<< public static bool HS { get { return m_Expansion >= Expansion.HS; } } public static bool TOL { get { return m_Expansion >= Expansion.TOL; } } ======= public static bool HS { get { return Expansion >= Expansion.HS; } } >>>>>>> public static bool HS { get { return Expansion >= Expansion.HS; } } ...
<<<<<<< using Autofac; ======= using System.Reflection; using Autofac; >>>>>>> using System.Linq; using System.Reflection; using Autofac; <<<<<<< using KenticoInspector.Core.Tokens; using System.Linq; using System.Reflection; ======= >>>>>>> using KenticoInspector.Core.Tokens;
<<<<<<< public WindowPadding viewPadding { get { return this._displayMetrics.viewPadding; } } public WindowPadding viewInsets { get { return this._displayMetrics.viewInsets; } } protected override void OnDisable() { D.assert(this._windowAdapt...
<<<<<<< var timer = new TimerImpl(DateTime.Now + duration, callback); lock (this._queue) { this._queue.enqueue(timer); } ======= var timer = new TimerImpl(duration, callback); this._queue.enqueue(timer); >>>>>>> var timer = new ...
<<<<<<< static readonly MaterialByBlendModeStencilComp _strokeAlphaMat; ======= static readonly Material _shadowBox; static readonly Material _shadowRBox; >>>>>>> static readonly MaterialByBlendModeStencilComp _strokeAlphaMat; static readonly Material _shadowBox; stati...
<<<<<<< this._updateScrollInput(); ======= if (this._textInput != null) { this._textInput.keyboardManager.Update(); } >>>>>>> this._updateScrollInput(); if (this._textInput != null) { ...
<<<<<<< public void drawTextBlob(TextBlob textBlob, Offset offset) { var mesh = MeshGenrator.generateMesh(textBlob, offset.dx, offset.dy); var font = FontManager.instance.getOrCreate(textBlob.style.fontFamily, textBlob.style.UnityFontSize); ======= public void drawTextBlob(Text...
<<<<<<< CardTheme cardTheme = null, ======= ChipThemeData chipTheme = null, >>>>>>> CardTheme cardTheme = null, ChipThemeData chipTheme = null, <<<<<<< cardTheme = cardTheme ?? new CardTheme(); ======= chipTheme = chipTheme ?? ChipThemeData.f...
<<<<<<< using System.Collections.Concurrent; using System.Collections.ObjectModel; ======= using System.Security.Cryptography.X509Certificates; >>>>>>> using System.Collections.Concurrent; using System.Collections.ObjectModel; using System.Security.Cryptography.X509Certificates; <<<<<<< private ObservableCo...
<<<<<<< ======= using System.Collections.Concurrent; using System.Collections.ObjectModel; using System.Security.Cryptography.X509Certificates; >>>>>>> using System.Collections.Concurrent; using System.Collections.ObjectModel; using System.Security.Cryptography.X509Certificates; <<<<<<< ISet<Aut...
<<<<<<< // <inheritdoc /> [Obsolete("The queries are now streaming by default")] ======= /// <inheritdoc /> [Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")] >>>>>>> // <inheritdoc /> ...
<<<<<<< using System.ComponentModel; ======= using System.Windows.Media.Animation; >>>>>>> using System.ComponentModel; using System.Windows.Media.Animation; <<<<<<< ======= if (fileTransferQueue.TryAdd(new RunbookTransferJob(selectedRunbook, RunbookTransferJob.TransferOperation.Download))) //TryAdd()...
<<<<<<< var completemap = GetStrategy(strategy).Generate(rng, reqs); #if DEBUG Console.Write(completemap.AsText()); #endif return completemap; } private IMapGeneratorEngine GetStrategy(MapGeneratorStrategy strategy) { switch (strategy) { case MapGeneratorStrategy.Cellular: return new Cell...
<<<<<<< #region IWordLibraryTextImport Members public Encoding Encoding { get { return Encoding.GetEncoding("GBK"); } } #endregion #endregion ======= >>>>>>> #region IWordLibraryTextImport Members public Encoding Encoding { ...
<<<<<<< image .BackgroundColor(Rgba32.Blue) .Fill(Rgba32.HotPink, new SixLabors.Shapes.Rectangle(10, 10, 190, 140)) .Save($"{path}/Rectangle.png"); ======= using (FileStream output = File.OpenWrite($"{path}/Rectangle.png")) ...
<<<<<<< // Note: This format can be called OS/2 BMPv1, or Windows BMPv2 public const string WinBmpv2 = "Bmp/pal8os2v1_winv2.bmp"; public const string Bit8Palette4 = "Bmp/pal8-0.bmp"; ======= public const string Os2v2Short = "Bmp/pal8os2v2-16.bmp"; >>>>>>> ...
<<<<<<< image .BackgroundColor(Rgba32.Blue) .DrawLines(Rgba32.HotPink, 5, new[] { ======= using (FileStream output = File.OpenWrite($"{path}/Simple.png")) { image .Ba...
<<<<<<< options.Service.GlobalFilters.Add<MyFilterAttribute>(); // Register filter by type. options.Service.GlobalFilters.Add(new MyFilterUsingFactoryAttribute("Global")); // Register filter with IMagicOnionFilterFactory. // options.Ser...
<<<<<<< il.Emit(OpCodes.Ldfld, resolverField); // ); ======= il.Emit(OpCodes.Ldfld, serializerOptionsField); >>>>>>> il.Emit(OpCodes.Ldfld, serializerOptionsField); // ); <<...
<<<<<<< if (settings.ViewSettings.ListViewColumsOrder == null) { settings.ViewSettings.ListViewColumsOrder = new List<GameField> { GameField.Icon, GameField.Name, GameField.ReleaseDate, ...
<<<<<<< if (extensions.LibraryPlugins.TryGetValue(game.PluginId, out var plugin)) { ======= if (extensions.LibraryPlugins.TryGetValue(tempGame.PluginId, out var plugin)) { >>>>>>> if (extension...
<<<<<<< //// ------------------ Publisher //bool publisherResult = false; //if (filterSettings.Publishers == null || filterSettings.Publishers.Count == 0) //{ // publisherResult = true; //} //else //{ // //...
<<<<<<< using Playnite.SDK.Metadata; ======= using System.Diagnostics; >>>>>>> using Playnite.SDK.Metadata; using System.Diagnostics; <<<<<<< var import = new ImportableProgram(new Program() ======= var productName = FileVersionInfo.GetVersionInfo(path).ProductName; var program = new Importab...
<<<<<<< public void SubjectBuffersConnected(IWpfTextView textView, ConnectionReason reason, Collection<ITextBuffer> subjectBuffers) ======= [Import] internal ITextDocumentFactoryService TextDocumentFactoryService { get; set; } public void VsTextViewCreated(IVsTextView textViewAdapter)...
<<<<<<< using MadsKristensen.EditorExtensions.Misc.Autoprefixer; ======= using Newtonsoft.Json.Linq; >>>>>>> using MadsKristensen.EditorExtensions.Misc.Autoprefixer; using Newtonsoft.Json.Linq;
<<<<<<< ======= //ball range finder gameObject.AddComponent ("netTransferToSwing"); //hitball gameObject.AddComponent ("netSwing"); //pause gameObject.AddComponent ("netPause"); >>>>>>> //ball range finder gameObject.AddComponent ("netTransferToSwing"); //hitball gameObject.AddCompone...
<<<<<<< using System.Threading; ======= using Windows.System; >>>>>>> using System.Threading; using Windows.System; <<<<<<< StartWatcher(); // Display a message bluetoothMessageText.Text = Common.GetResourceText("BluetoothOn"); ======= if (StartWatcher()) ...
<<<<<<< { // As this is a demo, we always show the rich exception page. // Make sure to hide it in production environments in real-world scearios to // hide your code from attackers. //if (env.IsDevelopment()) //{ app.UseDeveloperException...
<<<<<<< // aapt resource value: 0x7f0d00f3 public const int masked = 2131558643; ======= // aapt resource value: 0x7f0d001d public const int lottie_layer_name = 2131558429; >>>>>>> // aapt resource value: 0x7f0d00f3 public const int masked = 2131558643; // aapt resource value: 0x7f0d001d publ...
<<<<<<< var projectIssue = new ProjectIssue ======= var description = p.description; if (description.Contains(".*")) { ...
<<<<<<< private bool m_SearchCallTree = false; private bool m_SearchMatchCase = false; ======= private CallHierarchyView m_CallHierarchyView; private CallTreeNode m_CurrentCallTree; >>>>>>> <<<<<<< if (string.IsNullOrEmpty(m_SearchText)) return true; ...
<<<<<<< private IssueTable m_IssueTable; private ProjectIssue m_SelectedIssue = null; private CallHierarchyView m_CallHierarchyView; private bool m_EnableCPU = true; private bool m_EnableGPU = true; private bool m_EnableMemory = true; private bo...
<<<<<<< // Update the selection color MyMapView.SelectionProperties.Color = Color.Cyan; // Create Uri for the feature service ======= // Create Uri for the feature service. >>>>>>> // Update the selection color. MyMapView.SelectionProperties.Co...
<<<<<<< // Set the selection color. MyMapView.SelectionProperties.Color = Color.Cyan; // Create Uri for the feature service ======= // Create Uri for the feature service. >>>>>>> // Set the selection color. MyMapView.SelectionProperties.Color =...
<<<<<<< // Set the selection color. MyMapView.SelectionProperties.Color = Color.Cyan; // Create Uri for the feature service ======= // Create Uri for the feature service. >>>>>>> // Set the selection color. MyMapView.SelectionProperties.Color =...
<<<<<<< ======= public void Quit() => Close(); private void checkForNewVersionToolStripMenuItem_Click(object sender, EventArgs e) { this.mDoc.CheckForUpdates(); } >>>>>>> public void Quit() => Close(); private void checkForNewVersionToolStripMenuItem...
<<<<<<< this.showSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ======= this.checkForNewVersionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); >>>>>>> this.showSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ...