conflict_resolution
stringlengths
27
16k
<<<<<<< public override async Task<bool> InitializeTiltify(string authorizationCode = null) { this.Tiltify = (ChannelSession.Settings.TiltifyOAuthToken != null) ? new TiltifyService(ChannelSession.Settings.TiltifyOAuthToken) : new TiltifyService(authorizationCode); if (await this...
<<<<<<< private async void EnableQuotesToggleButton_Checked(object sender, RoutedEventArgs e) ======= protected override async Task OnVisibilityChanged() { await this.InitializeInternal(); } private void EnableQuotesToggleButton_Checked(object sender, RoutedEventAr...
<<<<<<< if (ChannelSession.TwitchUserConnection != null) { this.TwitchUserOAuthToken = ChannelSession.TwitchUserConnection.Connection.GetOAuthTokenCopy(); } if (ChannelSession.TwitchBotConnection != null) { this.TwitchBotOAuthTo...
<<<<<<< Affiliate = 23, ======= >>>>>>> Affiliate = 23, <<<<<<< if (this.MixerID > 0) { return StreamingPlatformTypeEnum.Mixer; } else if (!string.IsNullOrEmpty(this.TwitchID)) { return StreamingPlatformTypeEnum.Twitch; } ======= if (this.MixerID...
<<<<<<< [JsonIgnore] public bool IsAnonymous { get { if (this.Platform == StreamingPlatformTypeEnum.Mixer) { return this.MixerID == 0 || this.InteractiveIDs.Values.Any(i => i.anonymous.GetValueOrDefault()); } else if (this.Platform == Strea...
<<<<<<< UserViewModel user = new UserViewModel(0, card.data.Username); UserModel userModel = await ChannelSession.MixerStreamerConnection.GetUser(user.UserName); if (userModel != null) ...
<<<<<<< this.ReplaceSpecialIdentifier(MilestoneSpecialIdentifierHeader + "amountdifference", (patronageMilestone.target - patronageStatus.patronageEarned).ToString()); this.ReplaceSpecialIdentifier(MilestoneSpecialIdentifierHeader + "reward", patronageMilestone.Do...
<<<<<<< using MixItUp.Base.Services.Twitch; using MixItUp.Desktop.Services; ======= using MixItUp.WPF.Services; >>>>>>> using MixItUp.Base.Services.Twitch; using MixItUp.WPF.Services;
<<<<<<< ======= public event EventHandler<UserViewModel> OnFollowOccurred; public event EventHandler<UserViewModel> OnUnfollowOccurred; public event EventHandler<Tuple<UserViewModel, int>> OnHostedOccurred; public event EventHandler<UserViewModel> OnSubscribedOccurred; public e...
<<<<<<< else if (this.Platform == StreamingPlatformTypeEnum.Twitch) { return this.TwitchVisualName; } return this.unassociatedUsername; ======= return this.UnassociatedUsername; >>>>>>> else if (this.Platform == StreamingPlatformTypeEnum.Twitch) { retur...
<<<<<<< ======= public event EventHandler<UserViewModel> OnFollowOccurred; public event EventHandler<UserViewModel> OnUnfollowOccurred; public event EventHandler<Tuple<UserViewModel, int>> OnHostedOccurred; public event EventHandler<UserViewModel> OnSubscribedOccurred; public e...
<<<<<<< [JsonProperty] public OAuthTokenModel StreamlootsOAuthToken { get; set; } ======= [JsonProperty] public OAuthTokenModel IFTTTOAuthToken { get; set; } >>>>>>> [JsonProperty] public OAuthTokenModel IFTTTOAuthToken { get; set; } [JsonProperty] publ...
<<<<<<< var blockingAcquire = new Task<Task<IConnection>>(() => pool.AcquireAsync(AccessMode.Read)); ======= var blockingAcquire = new Task(() => { pool.Acquire(); }); var releaseConn = new Task(() => { conn.Close(); }); >>>>>>> var blockingAcquire = ne...
<<<<<<< // Annotations public const int ANNOTATION_HIDDEN = 0; public const int ANNOTATION_STANDARD = 1; public const int ANNOTATION_BOXED = 2; public const int ANNOTATION_INDENTED = 3; ======= // Keys public const int SCMOD_NORM = 0; public const int S...
<<<<<<< customHeaders = new Dictionary<string, string>(behaviors.CustomHeadersInternal); automaticDecompression = behaviors.AutomaticDecompression; ======= this.CookieContainer = behaviors.CookieContainer; >>>>>>> customHeaders = new Dictionary<string, string>(behavior...
<<<<<<< private readonly StatisticsModel stats; private readonly PipelineController pipelineController; ======= private readonly ConvertPolarShader polarConvertShader; private readonly PreprocessModel preprocess; >>>>>>> private readonly StatisticsModel stats; priva...
<<<<<<< ======= public void ShouldConnectServer() { var bufferSettings = new BufferSettings(Config.DefaultConfig); var connMock = new Mock<ITcpSocketClient>(); TcpSocketClientTestSetup.CreateReadStreamMock(connMock, new byte[] {0, 0, 0, 1}); ...
<<<<<<< if (proj.Debug) modDef.LoadPdb(); ======= context.CheckCancellation(); >>>>>>> context.CheckCancellation(); if (proj.Debug) modDef.LoadPdb();
<<<<<<< // [assembly: AssemblyVersion("1.1.*")] [assembly: AssemblyVersion("1.1.0.0")] [assembly: AssemblyFileVersion("1.1.0.0")] [assembly: InternalsVisibleTo("Neo4j.Driver.Tests"), InternalsVisibleTo("Neo4j.Driver.Tck.Tests")] ======= // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [a...
<<<<<<< ======= public override string ToString() { StringBuilder sb = new StringBuilder(); sb.Append("GrokFilter\n"); foreach (var prop in this.GetType().GetProperties()) { if (prop != null) { sb.Appen...
<<<<<<< public async Task ShowLeaderboardsAsync(IDiscordMessage mContext, LeaderboardOptions leaderboardOptions) ======= [Command(Name = "mybadges")] public async Task MyBadgesAsync(EventContext e) { int page = 0; using (var context = new MikiContext()) { User u = await context.Users.FindAsync(e....
<<<<<<< /// Looks up a localized string similar to and. /// </summary> internal static string time_and { get { return ResourceManager.GetString("time_and", resourceCulture); } } /// <summary> /// Looks up a localized st...
<<<<<<< private readonly SyncExecutor _syncExecutor; private readonly IDictionary<string, string> _routingContext; private IRoutingTable _routingTable; ======= private readonly IDiscovery _discovery; >>>>>>> private readonly IDiscovery _discovery; private readonly Syn...
<<<<<<< /// Looks up a localized string similar to Your account does not exist yet! If this problem keeps appearing, please notify us!. /// </summary> internal static string error_account_null { get { return ResourceManager.GetString("error_account_null", resourceCu...
<<<<<<< using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Attributes; using Bot.Models; using Discord; using Framework; using Framework.Commands; using Microsoft.EntityFrameworkCore; using Miki.Accounts; using Miki.Loca...
<<<<<<< /// Writes a value for the <code>position</code> property as a <code>cartesianVelocity</code> value. The <code>position</code> property specifies the position of the object in the world. The position has no direct visual representation, but it is used to locate billboards, labels, and other primitives ...
<<<<<<< /// <summary> /// The name of the <code>outlineColor</code> property. /// </summary> public const string OutlineColorPropertyName = "outlineColor"; /// <summary> /// The name of the <code>outlineWidth</code> property. /// </summary> public const s...
<<<<<<< sp.Object, telemetryProvider.Object, _cSharpScriptExecutor.Object); ======= ProtectedOperations, _factory.Create<IMarkDisplayUtil>(MockBehavior.Loose).Object, _factory.Create<IControlCharUtil>(MockBehavior.Loose).O...
<<<<<<< /// Subtract a negative decimal number /// </summary> [Test] public void SubtractFromWord_Decimal_Negative() { Create(" -10"); _buffer.Process(KeyInputUtil.CharWithControlToKeyInput('x')); Assert.AreEqual(" -11", _textBuffer.GetLine(0)....
<<<<<<< protected IVimBufferFactory VimBufferFactory { get { return _vimBufferFactory; } } protected MockVimHost VimHost { get { return (MockVimHost)_vim.VimHost; } } ======= protected IVimBufferFactory VimBufferFactory { ...
<<<<<<< private Mock<ICommandDispatcher> _commandDispatcher; ======= private Mock<IClipboardDevice> _clipboardDevice; >>>>>>> private Mock<ICommandDispatcher> _commandDispatcher; private Mock<IClipboardDevice> _clipboardDevice; <<<<<<< _commandDispatcher = _factory.Create...
<<<<<<< using Vim.Interpreter; ======= using System.Windows.Threading; using System.Diagnostics; >>>>>>> using System.Windows.Threading; using System.Diagnostics; using Vim.Interpreter; <<<<<<< private readonly ICSharpScriptExecutor _cSharpScriptExecutor; ======= private readonly IProtectedOperati...
<<<<<<< using Microsoft.VisualStudio.TextManager.Interop; using Microsoft.VisualStudio.Editor; using VimCoreTest.Utils; using Microsoft.VisualStudio; ======= using Microsoft.VisualStudio.Text.Operations; >>>>>>> using Microsoft.VisualStudio.TextManager.Interop; using Microsoft.VisualStudio.Editor; using VimCoreTest....
<<<<<<< private Mock<IVimBufferData> _vimBufferData; private Mock<ITextView> _textView; ======= private Mock<IWpfTextView> _textView; >>>>>>> private Mock<IVimBufferData> _vimBufferData; private Mock<IWpfTextView> _textView; <<<<<<< private Mock<ITextSelection> _selec...
<<<<<<< public virtual T GetChild<T>(int i) where T:IParseTree ======= public virtual T GetChild<T, _T1>(Type<_T1> ctxType, int i) where T : IParseTree where _T1 : T >>>>>>> public virtual T GetChild<T>(int i) where T : IParseTree <<<<<<< public vi...
<<<<<<< public const int DefaultTokenChannel = IToken.DefaultChannel; ======= public const int More = -2; public const int Skip = -3; public const int DefaultTokenChannel = TokenConstants.DefaultChannel; >>>>>>> public const int DefaultTokenChannel = TokenConstants.DefaultCh...
<<<<<<< List<long> toRemove = new List<long>(); foreach (var pair in mergedConfigs) ======= IEnumerator<KeyValuePair<long, ATNConfig>> iterator = mergedConfigs.EntrySet().GetEnumerator(); while (iterator.HasNext()) { if (iterator.Next().Valu...
<<<<<<< public DFASerializer(DFA dfa, IRecognizer parser) : this(dfa, parser != null ? parser.TokenNames : null, parser != null ? parser.RuleNames : null , parser != null ? parser.Atn : null) ======= public DFASerializer(DFA dfa, Recognizer<object, object> parser) ...
<<<<<<< /// <see cref="PredictionMode"/> /// <code>(</code> /// <see cref="Atn.PredictionMode.Sll"/> /// <code>)</code> ======= /// <see cref="PredictionMode(PredictionMode)">setPredictionMode</see> /// <c>(</c> /// <see cref="PredictionMode.Sll"/> /// <c>)</c> >>>>>>> /// <see cr...
<<<<<<< using Antlr4.Runtime.Sharpen; ======= >>>>>>> <<<<<<< /// <seealso cref="Antlr4.Runtime.Atn.ATNDeserializationOptions.GenerateRuleBypassTransitions()">Antlr4.Runtime.Atn.ATNDeserializationOptions.GenerateRuleBypassTransitions()</seealso> private static readonly IDictionary<string, ATN> bypas...
<<<<<<< public virtual string[] ToStrings(IRecognizer recognizer, int currentState ) ======= public virtual string[] ToStrings<_T0>(Recognizer<_T0> recognizer, int currentState) >>>>>>> public virtual string[] ToStrings(IRecognizer recognizer, int currentState) <<<<<<< pu...
<<<<<<< [return: NotNull] public virtual MultiMap<string, IParseTree> GetLabels() ======= public virtual MultiMap<string, IParseTree> Labels >>>>>>> [NotNull] public virtual MultiMap<string, IParseTree> Labels <<<<<<< [return: Nullable] public virtual IParseTr...
<<<<<<< return string.Format("failed predicate: {{{0}}}?", predicate); ======= return string.Format(CultureInfo.CurrentCulture, "failed predicate: {%s}?", predicate ); >>>>>>> return string.Format(CultureInfo.CurrentCulture, "failed predicate: {{{0}}}?", predicate ...
<<<<<<< [return: NotNull] public ILexerAction GetAction() ======= public ILexerAction Action >>>>>>> [NotNull] public ILexerAction Action
<<<<<<< public static readonly int SerializedVersion = 5; ======= public static readonly int SerializedVersion; static ATNSimulator() { SerializedVersion = 3; } public static readonly UUID SerializedUuid; static ATNSimulator() { ...
<<<<<<< IAntlrErrorListener<int> listener = GetErrorListenerDispatch(); listener.SyntaxError(this, 0, _tokenStartLine, _tokenStartCharPositionInLine, msg, e); ======= IAntlrErrorListener<int> listener = ErrorListenerDispatch; listener.SyntaxError(this, null, _tokenStart...
<<<<<<< string format = "reportAmbiguity d={0}: ambigAlts={1}, input='{2}'"; recognizer.NotifyErrorListeners(string.Format(format, GetDecisionDescription(recognizer , dfa.decision), ambigAlts, ((ITokenStream)recognizer.InputStream).GetText(Interval .Of(startIndex,...
<<<<<<< [return: NotNull] public virtual Lexer GetLexer() ======= public virtual Lexer Lexer >>>>>>> [NotNull] public virtual Lexer Lexer <<<<<<< [return: NotNull] public virtual Parser GetParser() ======= public virtual Parser Parser >>>>>>> ...
<<<<<<< /// <code>false</code> /// . This is the backing field for <see cref="IsPrecedenceDfa"/>. ======= /// <see langword="false"/> /// . This is the backing field for /// <see cref="IsPrecedenceDfa()"/> /// , /// <see cref="IsPrecedenceDfa(bool)"/> //...
<<<<<<< [return: NotNull] public PredictionMode GetPredictionMode() ======= public Antlr4.Runtime.Atn.PredictionMode PredictionMode >>>>>>> public Antlr4.Runtime.Atn.PredictionMode PredictionMode <<<<<<< if (optimize_closure_busy && c.GetContext().IsEmpty && !...
<<<<<<< public virtual int PredictATN(DFA dfa, ITokenStream input, ParserRuleContext outerContext , bool useContext) { if (outerContext == null) { outerContext = ParserRuleContext.EmptyContext; } int alt = 0; int m =...
<<<<<<< [return: NotNull] public virtual BitSet GetRepresentedAlternatives() ======= public virtual BitSet RepresentedAlternatives >>>>>>> [NotNull] public virtual BitSet RepresentedAlternatives <<<<<<< states.Add(c.State); ======= HashSet<AT...
<<<<<<< [return: NotNull] public string GetTokenName() ======= public string TokenName >>>>>>> [NotNull] public string TokenName <<<<<<< [return: Nullable] public string GetLabel() ======= public string Label >>>>>>> [Nullable] publi...
<<<<<<< /// <see cref="ATNConfig.Context"/> ======= /// <see cref="ATNConfig#context"/> >>>>>>> /// <see cref="ATNConfig.Context"/> <<<<<<< ATNConfig config = c.Transform(c.State, SemanticContext.None, false); dup.AddItem(config); ...
<<<<<<< using Antlr4.Runtime.Sharpen; ======= >>>>>>> <<<<<<< /// <see cref="IParseTree.Accept{T}(IParseTreeVisitor{T})">IParseTree.Accept&lt;T&gt;(IParseTreeVisitor&lt;Result&gt;)</see> ======= /// <see cref="IParseTree.Accept{T}(IParseTreeVisitor{Result})"/> >>>>>>> /// <see cref="IPars...
<<<<<<< using Antlr4.Runtime.Sharpen; ======= >>>>>>> <<<<<<< #if COMPACT ======= /// <?/> >>>>>>> #if COMPACT
<<<<<<< return string.Format(CultureInfo.CurrentCulture, "failed predicate: {{{0}}}?", predicate ); ======= return string.Format(CultureInfo.CurrentCulture, "failed predicate: {%s}?", predicate); >>>>>>> return string.Format(CultureInfo.CurrentCulture, "failed pred...
<<<<<<< public override string[] ToStrings(IRecognizer recognizer, int currentState ) ======= public override string[] ToStrings<_T0>(Recognizer<_T0> recognizer, int currentState) >>>>>>> public override string[] ToStrings(IRecognizer recognizer, int currentState) <<<<<<< ...
<<<<<<< public abstract bool Eval<Symbol, ATNInterpreter>(Recognizer<Symbol, ATNInterpreter> parser, RuleContext outerContext) where ATNInterpreter : ATNSimulator; ======= public abstract bool Eval<_T0>(Recognizer<_T0> parser, RuleContext parserCallStack); >>>>>>> public abstract...
<<<<<<< public void StripHiddenConfigs() { EnsureWritable(); List<long> toRemove = new List<long>(); foreach (var pair in mergedConfigs) { if (pair.Value.IsHidden) { toRemove.Add(pair.Key); ...
<<<<<<< [return: NotNull] public string GetTag() ======= public string Tag >>>>>>> [NotNull] public string Tag <<<<<<< [return: Nullable] public string GetLabel() ======= public string Label >>>>>>> [Nullable] public string Label
<<<<<<< #if false private static readonly Logger Logger = Logger.GetLogger(typeof(Antlr4.Runtime.Misc.RuleDependencyChecker ).FullName); #endif ======= private static readonly Logger Logger = Logger.GetLogger(typeof(Antlr4.Runtime.Misc.RuleDependencyChecker).FullName); >>>>>>> #if false ...
<<<<<<< public readonly IDictionary<string, TokensStartState> modeNameToStartState = new Dictionary<string, TokensStartState>(); ======= public readonly IDictionary<string, TokensStartState> modeNameToStartState = new LinkedHashMap<string, TokensStartState>(); >>>>>>> public read...
<<<<<<< public ParserInterpreter(string grammarFileName, IEnumerable<string> tokenNames, IEnumerable<string> ruleNames, ATN atn, ITokenStream input) ======= [System.ObsoleteAttribute(@"Use ParserInterpreter(string, IVocabulary, System.Collections.Generic.ICollection{E}, Antlr4.Runtime.Atn.ATN, ITokenS...
<<<<<<< /// <see cref="Antlr4.Runtime.TokenConstants.Eof">Antlr4.Runtime.TokenConstants.Eof</see> /// is added to the result set. ======= /// <see cref="Antlr4.Runtime.IToken.Eof">Antlr4.Runtime.IToken.Eof</see> /// is added to the result set.</p> >>>>>>> /// <see cref="Antlr4...
<<<<<<< #if !PORTABLE System.Console.Error.WriteLine("unknown recognition error type: " + e.GetType().FullName ); #endif ======= System.Console.Error.WriteLine("unknown recognition error type: " + e.GetType().FullName); >>>>>>> #if !PORTABLE...
<<<<<<< _outerGroupJoinIncludeContext = _groupJoinAsyncEnumerable._outerGroupJoinInclude?.Initialize(_groupJoinAsyncEnumerable._queryContext); _innerGroupJoinIncludeContext = _groupJoinAsyncEnumerable._innerGroupJoinInclude?.Initialize(_groupJoinAsyncEnumerable._queryCont...
<<<<<<< ======= using System.Collections.Generic; using System.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure.Internal; >>>>>>> <<<<<<< ======= using Microsoft.EntityFrameworkCore.Migrations.Internal; using Microsoft.EntityFrameworkCore.Relation...
<<<<<<< var result = CreateRelationalDataReader( ======= if (readerColumns != null) { reader = new BufferedDataReader(reader).Initialize(readerColumns); } var result = new RelationalDataReader( >>>>>>> ...
<<<<<<< ======= private static readonly MethodInfo _objectEqualsMethodInfo = typeof(object).GetRuntimeMethod(nameof(object.Equals), new[] { typeof(object), typeof(object) }); >>>>>>> private static readonly MethodInfo _objectEqualsMethodInfo = typeof(object).G...
<<<<<<< ======= public override void Include_reference_collection_order_by_reference_navigation() { } protected override IQueryable<Level1> GetExpectedLevelOne() => ComplexNavigationsData.SplitLevelOnes.AsQueryable(); protected override IQueryable<Level2> GetExpe...
<<<<<<< value = ConvertUnderlyingEnumValueToEnum(value); ======= if (!_quirk19128) { value = ConvertUnderlyingEnumValueToEnum(value); } >>>>>>> value = ConvertUnderlyingEnumValueToEnum(value); if (!_quirk19128) { ...
<<<<<<< /// <summary> /// This API supports the Entity Framework Core infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. /// </summary> public static string Format([NotNull] IEnumerable<IPropert...
<<<<<<< public override async Task Generic_Ilist_contains_translates_to_server(bool isAsync) { await base.Generic_Ilist_contains_translates_to_server(isAsync); AssertSql( @"SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName],...
<<<<<<< var query = context.Customers .Include(v => v.Orders) .Where(v => v.CustomerID == "MAMRFC") .ToList(); ======= var query = context.Customers .Include(v => v.Orders) .Wher...
<<<<<<< public virtual bool IsNullable { get; set; } ======= /// <summary> /// Indicates whether or not this column can contain <c>NULL</c> values. /// </summary> public virtual bool IsNullable { get; [param: NotNull] set; } /// <summary> /// The datab...
<<<<<<< using System.Data.SqlClient; ======= using System.Collections.Generic; using System.Diagnostics; >>>>>>> using System.Data.SqlClient; <<<<<<< ======= using Microsoft.EntityFrameworkCore.Infrastructure.Internal; using Microsoft.EntityFrameworkCore.Internal; using Microsoft.EntityFrameworkCore.Migrations.In...
<<<<<<< #if (NET451 || DNX451) ======= if (_dependencyContext != null) { var library = _dependencyContext .CompileLibraries .FirstOrDefault(l => l.PackageName.Equals(name, StringComparison.OrdinalIgnoreCase)); if (librar...
<<<<<<< : IPrimaryKeyConvention, IForeignKeyConvention, IForeignKeyRemovedConvention, IModelConvention ======= : IKeyConvention, IPrimaryKeyConvention, IForeignKeyConvention, IForeignKeyRemovedConvention >>>>>>> : IPrimaryKeyConvention, IForeignKeyConvention, IForeignKeyRemovedConvention <<<...
<<<<<<< public class OptimisticConcurrencySqliteTest : OptimisticConcurrencyRelationalTestBase<F1SqliteFixture> ======= public class OptimisticConcurrencyULongSqliteTest : OptimisticConcurrencySqliteTestBase<F1ULongSqliteFixture, ulong?> { public OptimisticConcurrencyULongSqliteTest(F1ULongSqliteF...
<<<<<<< [ConditionalFact] public virtual void String_include_multiple_derived_navigation_with_same_name_and_same_type() ======= [ConditionalFact] public virtual void Include_reference_with_groupby_in_subquery() { AssertIncludeQuery<Level1>( l1s => l1...
<<<<<<< [ConditionalTheory(Skip = "Cross collection join Issue#17246")] public override Task Projecting_Length_of_a_string_property_after_FirstOrDefault_on_correlated_collection(bool async) { return base.Projecting_Length_of_a_string_property_after_FirstOrDefault_on_correlated_collec...
<<<<<<< ReplaceConvention(conventionSet.PropertyFieldChangedConventions, (DatabaseGeneratedAttributeConvention)valueGenerationStrategyConvention); conventionSet.PropertyNullableChangedConventions.Add(sqlServerIndexConvention); conventionSet.PropertyAnnotationSetConventions.Add(sqlS...
<<<<<<< using Microsoft.EntityFrameworkCore.ValueGeneration; ======= using Microsoft.Extensions.Logging; >>>>>>> using Microsoft.EntityFrameworkCore.ValueGeneration; using Microsoft.Extensions.Logging; <<<<<<< => ((IInfrastructure<InternalModelBuilder>)ModelBuilder).Instance.Validate() == null ? nul...
<<<<<<< case Keywords.Cache: CacheMode mode; if (!Enum.TryParse<CacheMode>(value as string, out mode)) { throw new ArgumentException(Strings.FormatInvalidCacheMode(value)); } ...
<<<<<<< using AAEmu.Game.Models.Game.Items; ======= using AAEmu.Game.Models.Game.Units; >>>>>>> using AAEmu.Game.Models.Game.Items; using AAEmu.Game.Models.Game.Units;
<<<<<<< var doc = RapidXamlDocument.Create(snapshot, file, vsa, string.Empty); Cache.Add(file, doc); ======= var doc = RapidXamlDocument.Create(snapshot, file, vsa); lock (CacheLock) { Cache.Add(file, doc); ...
<<<<<<< Mappings = MappingsForStackPanelWithoutHeaders(), AttemptAutomaticDocumentFormatting = true, ======= Mappings = MappingsForUwpStackPanelWithoutHeaders(), General = new GeneralSettings { ...
<<<<<<< internal override Entity InnerSimplify() => Var.InnerSimplified is Variable var ? SequentialIntegrating(Expression.InnerSimplified, var, Iterations) : this; ======= protected override Entity InnerSimplify() => Var.InnerSimplified is Variable ...
<<<<<<< public bool CanEditBlog { get { return currentBlog != null; } } public bool CanRemoveBlog { get { return currentBlog != null; } } public BlogSetting CurrentBlog { get { return currentBlog; } set { currentBlog = value; ...
<<<<<<< void TextView_VisualLinesChanged(object sender, EventArgs e) { DoSpellCheck(); } ======= void DocumentViewSizeChanged(object sender, SizeChangedEventArgs e) { // Hide web browser when the window is too small for it to make much sense ...
<<<<<<< public DocumentViewModel(IDialogService dialogService, IWindowManager windowManager, ISiteContextGenerator siteContextGenerator, Func<string, IMetaWeblogService> getMetaWeblog, ISettingsProvider settingsProvider) ======= readonly Regex wordCountRegex = new ...
<<<<<<< using Ookii.Dialogs.Wpf; ======= using MarkPad.Updater; >>>>>>> using Ookii.Dialogs.Wpf; using MarkPad.Updater; <<<<<<< SettingsViewModel settingsCreator, ======= UpdaterViewModel updaterViewModel, >>>>>>> SettingsViewModel settingsCreator, UpdaterViewModel...
<<<<<<< using MarkPad.Updater; using Ookii.Dialogs.Wpf; using System.Linq; using wyDay.Controls; ======= >>>>>>> using MarkPad.Updater;
<<<<<<< using MarkPad.Events; ======= using MarkPad.Framework.Events; >>>>>>> using MarkPad.Events; using MarkPad.Framework.Events; <<<<<<< internal class ShellViewModel : Conductor<IScreen>, IHandle<FileOpenEvent> ======= internal class ShellViewModel : Conductor<IScreen>, IHandle<AppStartedEvent> >>>>>...
<<<<<<< #region public bool FloatingToolbarEnabled ======= public static readonly DependencyProperty DocumentProperty = DependencyProperty.Register("Document", typeof(TextDocument), typeof(MarkdownEditor), new PropertyMetadata(default(TextDocument))); public TextDocument Document ...
<<<<<<< public bool EnableSpellCheck { get; set; } ======= public bool EnableFloatingToolBar { get; set; } >>>>>>> public bool EnableFloatingToolBar { get; set; } public bool EnableSpellCheck { get; set; } <<<<<<< EnableSpellCheck = settings.SpellCheckEnabled; ======= EnableFloatingToolBar = setti...
<<<<<<< private readonly IWindowManager _windowManager; private readonly ISettingsService _settingsService; ======= private readonly IWindowManager windowService; >>>>>>> private readonly IWindowManager _windowManager; private readonly ISettingsService _settingsService; <<<<<...
<<<<<<< using wyDay.Controls; ======= using System.Linq; >>>>>>> using System.Linq; using wyDay.Controls; <<<<<<< ======= InitialiseDefaultSettings(); >>>>>>> InitialiseDefaultSettings(); <<<<<<< foreach (var fn in filenames) eventAggregator.Publish(n...
<<<<<<< using System; using System.IO; using System.Text.RegularExpressions; ======= using System; using System.IO; using System.Windows.Threading; >>>>>>> using System; using System.IO; using System.Windows.Threading; using System.Text.RegularExpressions; <<<<<<< using MarkdownSharp; using MarkPad.Metaweblog; =...