conflict_resolution
stringlengths
27
16k
<<<<<<< [assembly: AssemblyInformationalVersion("6.0.1-alpha1")] ======= [assembly: AssemblyInformationalVersion("6.0.0")] #endif >>>>>>> [assembly: AssemblyInformationalVersion("6.0.1-alpha1")] #endif
<<<<<<< _postBuffer1.SetCounterValue(0); ======= _postBuffer.SetCounterValue(0); _compute.SetFloat("_Threshold", _threshold); >>>>>>> _postBuffer1.SetCounterValue(0); _compute.SetFloat("_Threshold", _threshold);
<<<<<<< groupKey.Name, new BulkheadConfiguration ======= >>>>>>> <<<<<<< mockLogFactory.Setup(m => m.CreateLog<BulkheadFactory>()).Returns(new DefaultMjolnirLog<BulkheadFactory>()); mockLogFactory.Setup(m => m.CreateLog<SemaphoreBulkheadHolder>()).Retu...
<<<<<<< public bool Equals2(in EquatableValue other) => Address != 0 && Address == other.Address; public bool? Equals3(in EquatableValue other) => Address == 0 && other.Address == 0 ? (bool?)null : Address == other.Address; public new int GetHashCode() => Address == 0 ? 0 : Address.GetHashCode(); ======= ...
<<<<<<< if (!(td is null)) { var s = TypeFormatterUtils.GetNumberOfOverloadsString(td, method.Name); if (!(s is null)) ======= if (td != null) { var s = TypeFormatterUtils.GetNumberOfOverloadsString(td, method); if (s != null) >>>>>>> if (!(td is null)) { var s = TypeFormatterUtils.GetNu...
<<<<<<< public override string Title => hexNode.ToString(); public override object? ToolTip => hexNode.ToString(); ======= public override string Title => hexNode.ToString(DocumentNodeWriteOptions.Title); public override object ToolTip => hexNode.ToString(DocumentNodeWriteOptions.Title | DocumentNodeWriteOpti...
<<<<<<< public EditAssemblyVM(RawModuleBytesProvider rawModuleBytesProvider, IOpenFromGAC openFromGAC, IOpenAssembly openAssembly, ILanguageCompiler languageCompiler, IDecompiler decompiler, ModuleDef module) : base(rawModuleBytesProvider, openFromGAC, openAssembly, languageCompiler, decompiler, module) => StartDe...
<<<<<<< using System.Diagnostics; using System.Text; ======= >>>>>>> using System.Diagnostics; <<<<<<< public DocumentTabContent? Create(IDocumentTabContentFactoryContext context) => new DecompileDocumentTabContent(this, context.Nodes, DecompilerService.Decompiler); ======= public DocumentTabContent Create...
<<<<<<< this.wpfHexView = wpfHexView ?? throw new ArgumentNullException(nameof(wpfHexView)); ======= if (wpfHexView == null) throw new ArgumentNullException(nameof(wpfHexView)); this.wpfHexView = wpfHexView; Initialize(); >>>>>>> this.wpfHexView = wpfHexView ?? throw new ArgumentNullException(name...
<<<<<<< Debug.Assert(td != null); SelectType(td); ======= Debug.Assert(!(td is null)); Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => { var typeNode = DocumentTreeView.FindNode(td); if (!(typeNode is null)) DocumentTreeView.TreeView.SelectItems...
<<<<<<< public bool Equals2(in EquatableValue other) => Address != 0 && Address == other.Address; public bool? Equals3(in EquatableValue other) => Address == 0 && other.Address == 0 ? (bool?)null : Address == other.Address; public new int GetHashCode() => Address == 0 ? 0 : Address.GetHashCode(); ======= ...
<<<<<<< public override string Title => node.ToString(); public override object? ToolTip => node.ToString(); ======= public override string Title => node.ToString(DocumentNodeWriteOptions.Title); public override object ToolTip => node.ToString(DocumentNodeWriteOptions.Title | DocumentNodeWriteOptions.ToolTip)...
<<<<<<< /// <summary> /// Verifies that the U+0000 characters are removed from the source data. /// </summary> [TestMethod] [TestCategory("Other")] public void Version() { var version = CommonMarkConverter.Version; Assert.AreEqual(0, vers...
<<<<<<< var rowPtr = ResultsHandle.GetRow(index); var rowHandle = Realm.CreateRowHandle(rowPtr, _realm.SharedRealmHandle); return (T)(object)_realm.MakeObjectForRow(typeof(T), rowHandle); ======= var row = NativeResults.get_row(ResultsHandle, (IntPtr)ind...
<<<<<<< var wovenAtt = schema.Type.GetCustomAttribute<WovenAttribute>(); if (wovenAtt == null) throw new RealmException($"Fody not properly installed. {schema.Type.FullName} is a RealmObject but has not been woven."); var helper = (Weaving.IRealmObjectHelper)Activator...
<<<<<<< T GetValue<T>(IGroupHandle groupHandle, string tableName, string propertyName, long rowIndex); void SetValue<T>(IGroupHandle groupHandle, string tableName, string propertyName, long rowIndex, T value); IList<T> GetListValue<T>(IGroupHandle groupHandle, string tableName, string propertyNa...
<<<<<<< [TestCase(1000000, 100), Explicit] public void BindingPerformanceTest(int totalRecs, int recsPerTrans) ======= [TearDown] public void TearDown() { _realm.Close(); Realm.DeleteRealm(_realm.Config); } [TestCase(1000000), Explicit]...
<<<<<<< ======= var parameters = listParameters.ToArray(); var convertParameters = true; if(new[] { "concat", "xconcat", "currentproperty"}.Contains(functionName)) { convertParameters = false;...
<<<<<<< else ======= else if (property.Name.TrimStart().StartsWith("#eval")) { EvalOperation(property, parentArray, currentArrayToken, ref loopProperties, ref tokensToAdd); } else if (property.N...
<<<<<<< private static void RecursiveEvaluate(JToken parentToken, JArray parentArray, JToken currentArrayToken, JUSTContext localContext) ======= private static void RecursiveEvaluate(JToken parentToken, string inputJson, JArray parentArray, JToken currentArrayToken, JUSTContext localContext) >>>>>>...
<<<<<<< using System.Threading; using System.Threading.Tasks; ======= using System.Diagnostics.Contracts; >>>>>>> using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks;
<<<<<<< //以下是斗地主服务端自定义全局组件 //GateGlobalComponent Game.Scene.AddComponent<UserComponent>(); Game.Scene.AddComponent<LandlordsGateSessionKeyComponent>(); //MapGlobalComponent ...
<<<<<<< ======= ETModel_GlobalConfigComponent_Binding.Register(app); ETModel_GlobalProto_Binding.Register(app); ETModel_NetworkHelper_Binding.Register(app); UnityEngine_UI_InputField_Binding.Register(app); ETModel_NetworkComponent_Binding.Register(app); ...
<<<<<<< private Dictionary<int, StartConfig> configDict; ======= private Dictionary<int, StartConfig> configDict; private Dictionary<int, IPEndPoint> innerAddressDict = new Dictionary<int, IPEndPoint>(); public StartConfig StartConfig { get; private set; } >>>>>>> private Dictionary<int, ...
<<<<<<< ======= System_Collections_Generic_Dictionary_2_Type_Queue_1_Object_Binding.Register(app); System_Collections_Generic_Queue_1_Object_Binding.Register(app); ETModel_SessionCallbackComponent_Binding.Register(app); >>>>>>> System_Collections_Generic_Dictionary_2_T...
<<<<<<< ETModel_Entity_Binding.Register(app); ETModel_Game_Binding.Register(app); ETModel_ClientComponent_Binding.Register(app); ETModel_Component_Binding.Register(app); ETModel_User_Binding.Register(app); UnityEngine_LayerMask_Binding.Register(app...
<<<<<<< AllServer = Manager | Realm | Gate | Http | DB | Location | Map | Match } ======= AllServer = Manager | Realm | Gate | Http | DB | Location | Map | BenchmarkWebsocketServer } >>>>>>> AllServer = Manager | Realm | Gate | Http | DB | Location | Map | BenchmarkWebsocketServer | Match }
<<<<<<< using System; using AustinHarris.JsonRpc; using Microsoft.VisualStudio.TestTools.UnitTesting; ======= using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using AustinHarris.JsonRpc.Client; using AustinHarris.JsonRpc; using Newtonsoft.Json.Linq; >>>>>>> using System; using AustinHarris.JsonR...
<<<<<<< public static Variable MakeStr(string str) { return Kernel.BoxAnyMO(str, Kernel.StrMO); } ======= public static Variable MakeComplex(Complex z) { return Kernel.BoxAnyMO<Complex>(z, Kernel.ComplexMO); } >>>>>>> public static Variable MakeStr(string str) { return ...
<<<<<<< private const string BF_DESERIALIZE = "System.Runtime.Serialization.Formatters.Binary.BinaryFormatter::Deserialize"; private const string DC_JSON_READ_OBJ = "System.Runtime.Serialization.Json.DataContractJsonSerializer::ReadObject"; private const string DC_XML_READ_OBJ = "System.Runtime....
<<<<<<< private volatile ApolloConfig _configCache; private volatile ServiceDto _longPollServiceDto; private volatile ApolloNotificationMessages _remoteMessages; private Exception _syncException; ======= private volatile ThreadSafe.AtomicReference<ApolloConfig> _configCache = n...
<<<<<<< if (Meta != null && Meta.TryGetValue(Env.ToString(), out var meta) && !string.IsNullOrWhiteSpace(meta)) return meta; return ConfigConsts.DefaultMetaServerUrl; } set => _metaServer = ConfigConsts.DefaultMetaServerUrl == value ? null : v...
<<<<<<< using Com.Ctrip.Framework.Apollo.Enums; using System; ======= using System; using System.Collections.Generic; >>>>>>> using Com.Ctrip.Framework.Apollo.Enums; using System; using System.Collections.Generic;
<<<<<<< using Telerik.Sitefinity.Frontend.TestUtilities.CommonOperations; ======= using Telerik.Sitefinity.Frontend.TestUtilities; >>>>>>> using Telerik.Sitefinity.Frontend.TestUtilities.CommonOperations; using Telerik.Sitefinity.Frontend.TestUtilities; <<<<<<< FeatherServerOperations.ResourcePackages()...
<<<<<<< ======= private static PageTemplateFramework ExtractFramework() { var contextItems = SystemManager.CurrentHttpContext.Items; PageTemplateFramework framework = (PageTemplateFramework)contextItems["PageTemplateFramework"]; return framework; } ...
<<<<<<< using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; using System.Text; namespace Telerik.Sitefinity.Frontend.TestUtilities.CommonOperations { /// <summary> /// Provides common resource packages operations /// </summary> public class Reso...
<<<<<<< this.ninjectDependencyResolver = new StandardKernel(); FrontendModuleInstaller.Initialize(this.DependencyResolver); ======= SystemManager.RegisterServiceStackPlugin(new ListsServiceStackPlugin()); SystemManager.RegisterServiceStackPlugin(new FilesServiceStackPlu...
<<<<<<< using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; using System.Text; namespace Telerik.Sitefinity.Frontend.TestUtilities.CommonOperations { /// <summary> /// Provides common resource packages operations /// </summary> public class Reso...
<<<<<<< ======= private static string ConvertColor(string color) { if (!String.IsNullOrEmpty(color) && color.Substring(0, 1) == "#") { Color c = ColorTranslator.FromHtml(color); return string.Format("rgb({0},{1},{2})", c.R, c.G, c.B); ...
<<<<<<< public TableJournal(string targetDbConnectionString) : this(() => new SqlConnection(targetDbConnectionString), "dbo", "SchemaVersions", new ConsoleLog()) ======= /// <param name="targetDbConnectionString">The connection to the target database.</param> /// <example> /// var jour...
<<<<<<< private readonly ILog log; ======= private readonly string dbConnectionString; private readonly ILog log; private readonly string schema; >>>>>>> private readonly ILog log; private readonly string schema; <<<<<<< this.connectionFactory = connecti...
<<<<<<< new EmbeddedScriptProvider(typeof (Program).Assembly) ); ======= new EmbeddedScriptProvider(typeof (Program).Assembly), new TableJournal(database.ConnectionString), new SqlScriptExecutor(database.ConnectionStri...
<<<<<<< private readonly ILog log; ======= private readonly string dbConnectionString; private readonly ILog log; private readonly string schema; >>>>>>> private readonly ILog log; private readonly string schema; <<<<<<< this.connectionFactory = connecti...
<<<<<<< slider = new UISlider (new RectangleF (10f + captionSize.Width, UIDevice.CurrentDevice.CheckSystemVersion (7, 0) ? 18f : 12f, cell.ContentView.Bounds.Width - 20 - captionSize.Width, 7f)) { ======= slider = new UISlider (new CGRect (10f + captionSize.Width, 12f, 280f - captionSize.Width, 7f)){ >>>>>>>...
<<<<<<< if (refreshView != null){ var bounds = View.Bounds; refreshView.Frame = new RectangleF (0, -bounds.Height, bounds.Width, bounds.Height); } //Console.WriteLine (View.Bounds); ======= ReloadData (); >>>>>>> if (refreshView != null){ var bounds = View.Bounds; ref...
<<<<<<< var field = _automation.GetElement(elementSelector, conditions); field.Focus(); field.Click(clickMode); ======= CurrentActionBucket.Add(() => { var field = _automation.GetElement(elementSelector, conditions); field.Foc...
<<<<<<< /// <summary> /// Clicks this instance. /// </summary> void Click(); /// <summary> /// Focuses this instance. /// </summary> ======= void Click(ClickMode clickMode); >>>>>>> /// <summary> /// Focuses this instance. ///...
<<<<<<< Provider.TakeAssertExceptionScreenshot(); throw new AssertException("Class name assertion failed. Expected element [{0}] to include a CSS class of [{1}] but current CSS class is [{2}].", fieldSelector, className, elementClassName.PrettifyErrorValue()); ======= ...
<<<<<<< _automation.TakeAssertExceptionScreenshot(); throw new AssertException("Count assertion failed. Expected there to be [{0}] elements matching [{1}]. Actual count is [{2}]", _count, fieldSelector, elements.Count()); } ======= var elements = Provider.Ge...
<<<<<<< process.StartInfo.FileName = Process.GetCurrentProcess().MainModule.FileName; process.StartInfo.Arguments = Arguments; process.StartInfo.UseShellExecute = true; process.StartInfo.Verb = "runas"; try { ...
<<<<<<< using System; using System.CodeDom.Compiler; using System.Collections.Generic; using System.Diagnostics; using System.IO; using Common.Logging; using Common.Logging.Simple; using NUnit.Framework; namespace Common { [TestFixture] public class TestRunner { private static readonly ILog Log; ...
<<<<<<< using System.Runtime.InteropServices; ======= >>>>>>> <<<<<<< ======= using System.Runtime.InteropServices; >>>>>>> using System.Runtime.InteropServices;
<<<<<<< /// Flush callback /// </summary> protected readonly Action<long> FlushCallback = null; /// <summary> ======= /// Flush callback /// </summary> protected readonly Action<CommitInfo> FlushCallback = null; /// <summary> /// Error handling...
<<<<<<< using NeoServer.Data.Model; using NeoServer.Server.Model.Players; ======= using NeoServer.Loaders.Vocations; >>>>>>> using NeoServer.Loaders.Vocations; using NeoServer.Data.Model; using NeoServer.Server.Model.Players; <<<<<<< context.SaveChanges(); var accounts = context.Accounts.AsQueryable().ToList(); c...
<<<<<<< false, String.Format( "Method '{0}' with parameters '{1}' not found", methodName, PrettyPrint(getParameterTypesMethod, genericArgumentsCount))); ======= false, String.Format(CultureInfo.CurrentCulture, "Method '{0}' with parameters '{1}' ...
<<<<<<< private static bool TryHandleGetHashCode(IInterceptedFakeObjectCall fakeObjectCall) ======= private bool TryHandleGetHashCode(IWritableFakeObjectCall fakeObjectCall) >>>>>>> private bool TryHandleGetHashCode(IInterceptedFakeObjectCall fakeObjectCall)
<<<<<<< using System.Linq; using Flepper.QueryBuilder.Base; =======  >>>>>>> using System.Linq;
<<<<<<< private async Task SetPageSizeAsync(ChangeEventArgs args) ======= [Inject] IStringLocalizer<Localization.Localization> Localization { get; set; } private void SetPageSize(ChangeEventArgs args) >>>>>>> [Inject] IStringLocalizer<Localization.Localization> Locali...
<<<<<<< private bool _originalStartWithWindows; ======= private bool _originalHookAltTab; >>>>>>> <<<<<<< public bool StartWithWindows { get; set; } ======= public bool HookAltTab { get; set; } >>>>>>> <<<<<<< // Settings StartWithWindows = _originalStartWithWindows = GetStartWithWindows(); =====...
<<<<<<< .HttpRoute(route => route .HttpFunction<HttpCommandWithNoRoute>() ) .Storage("storageConnectionString", storage => storage ======= .HttpRoute("outputBindings", ro...
<<<<<<< public bool IsEnum => Type.IsEnum; } ======= public bool IsNullable => Type.IsGenericType && Type.GetGenericTypeDefinition() == typeof(Nullable<>); public string NullableType => Type.GetGenericArguments().First().FullName; public bool IsNullableTypeHasTryParseMethod => IsNullabl...
<<<<<<< #if !SILVERLIGHT [TestClass] ======= [TestFixture] >>>>>>> #if !SILVERLIGHT [TestFixture]
<<<<<<< #if !SILVERLIGHT [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIGHT [Test] <<<<<<< g.LoadFromFile("InferenceTest.ttl"); ======= FileLoader.Load(g, "resources\\InferenceTest.ttl"); >>>>>>> FileLoader.Load(g, "resources\\InferenceTest.ttl");
<<<<<<< #if !NO_XMLENTITIES [TestMethod] ======= [Test] >>>>>>> #if !NO_XMLENTITIES [Test] <<<<<<< #if !NO_HTMLAGILITYPACK [TestMethod] ======= [Test] >>>>>>> #if !NO_HTMLAGILITYPACK [Test] <<<<<<< #if !NO_XMLENTITIES [TestMethod] ======= [Test] ...
<<<<<<< #if !NO_SYSTEMCONFIGURATION [TestMethod] ======= [Test] >>>>>>> #if !NO_SYSTEMCONFIGURATION [Test] <<<<<<< #if !NO_SYSTEMCONFIGURATION [TestMethod] ======= [Test] >>>>>>> #if !NO_SYSTEMCONFIGURATION [Test] <<<<<<< #if !NO_SYSTEMCONFIGURATION [TestM...
<<<<<<< #if !NO_COMPRESSION [TestMethod] ======= [Test] >>>>>>> #if !NO_COMPRESSION [Test] <<<<<<< #if !NO_COMPRESSION [TestMethod] ======= [Test] >>>>>>> #if !NO_COMPRESSION [Test] <<<<<<< #if !NO_COMPRESSION [TestMethod] ======= [Test] >>>>>>>...
<<<<<<< #if !PORTABLE [TestMethod] ======= [Test] >>>>>>> #if !PORTABLE [Test] <<<<<<< #if !NO_FILE // No FileLoader [TestMethod] ======= [Test] >>>>>>> #if !NO_FILE // No FileLoader [Test]
<<<<<<< #if !SILVERLIGHT // No SparqlRemoteEndpoint.QueryRaw() [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIGHT // No SparqlRemoteEndpoint.QueryRaw() [Test] <<<<<<< #if !PORTABLE // No VirtuosoManager in PCL [TestMethod] ======= [Test] >>>>>>> #if !PORTABLE // No Vi...
<<<<<<< //Run manifests this.RunManifest("resources\\turtle11\\manifest.ttl", posSyntaxTest, negSyntaxTest); ======= //Nodes for positive and negative tests Graph g = new Graph(); g.NamespaceMap.AddNamespace("rdft", UriFactory.Create("http://www....
<<<<<<< ======= /// <summary> /// See <see cref="IGraphPatternBuilder.Child(Action{IGraphPatternBuilder})"/> /// </summary> public static IQueryBuilder Child(this IDescribeBuilder describeBuilder, Action<IGraphPatternBuilder> buildGraphPattern) { return describeBuil...
<<<<<<< #if !SILVERLIGHT [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIGHT [Test] <<<<<<< #if !SILVERLIGHT [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIGHT [Test] <<<<<<< #if !SILVERLIGHT [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIG...
<<<<<<< #if !NO_FILE [TestMethod] ======= [Test] >>>>>>> #if !NO_FILE [Test] <<<<<<< #if !SILVERLIGHT [TestMethod] ======= [Test] >>>>>>> #if !SILVERLIGHT [Test]
<<<<<<< using UnityEditor.Experimental.UIElements.GraphView; using UnityEngine; ======= using UnityEngine; >>>>>>> using UnityEngine; using UnityEditor.Experimental.UIElements.GraphView;
<<<<<<< [Test] public void WritingCharEscaping() { List<IRdfReader> readers = new List<IRdfReader>() { new TurtleParser(), new Notation3Parser() }; List<IRdfWriter> writers = new List<IRdfWriter>() { ...
<<<<<<< #if !NO_SYNC_HTTP // Test requires synchronous APIs [TestMethod] ======= [Test] >>>>>>> #if !NO_SYNC_HTTP // Test requires synchronous APIs [Test] <<<<<<< #if !PORTABLE // No VirutousoManager in PCL [TestMethod] ======= [Test] >>>>>>> #if !PORTABLE // No VirutousoM...
<<<<<<< // <summary> // Constructs a <see cref="LazyInternalContext" /> for the given <see cref="DbContext" /> owner that will be initialized // on first use. // </summary> // <param name="owner"> // The owner <see cref="DbContext" /> . // </param> // <par...
<<<<<<< #if !PORTABLE // No VirtuosoManager in PCL [TestMethod] ======= [Test] >>>>>>> #if !PORTABLE // No VirtuosoManager in PCL [Test] <<<<<<< #if !NO_SYNC_HTTP // Require Sync interface for test [TestMethod] ======= [Test] >>>>>>> #if !NO_SYNC_HTTP // Require Sync inter...
<<<<<<< parent.LoadFromFile("InferenceTest.ttl"); ======= FileLoader.Load(parent, "resources\\InferenceTest.ttl"); >>>>>>> FileLoader.Load(parent, "resources\\InferenceTest.ttl"); <<<<<<< parent.LoadFromFile("Turtle.ttl"); ======= FileLoader.Load(parent,...
<<<<<<< [Test] public void WritingStringBackslashEscapingTurtle() ======= [TestMethod] public void WritingStringBackslashEscapingTurtle1() >>>>>>> [Test] public void WritingStringBackslashEscapingTurtle1() <<<<<<< [Test] public void WritingStringBacksl...
<<<<<<< this.clientRepository.Create(client); TempData["Message"] = "Client Created"; return RedirectToAction("Edit", new { id = client.ID }); ======= this.clientRepository.Create(model); TempData["Message"] = Resource...
<<<<<<< else if (keyboard_preference == PreferredKeyboard.Logitech_G213) layoutConfigPath = Path.Combine(layoutsPath, "logitech_g213.json"); else if (keyboard_preference == PreferredKeyboard.Logitech_G815) layoutConfigPath = Path.Combine(layoutsPath, "logitech_g815.json"); ...
<<<<<<< public event PropertyChangedEventHandler PropertyChanged; ======= public LightEventConfig WithLayer<T>() where T : ILayerHandler { ExtraAvailableLayers.Add(typeof(T)); return this; } >>>>>>> public event PropertyChangedEventHandler PropertyChanged; ...
<<<<<<< _ID = "Ambilight"; Initialize(); captureTimer = new Timer(GetIntervalFromFPS(Properties.AmbiLightUpdatesPerSecond)); captureTimer.Elapsed += TakeScreenshot; ======= if (captureTimer == null) { this.Initialize(); ...
<<<<<<< devices.Add(new DeviceContainer(new Devices.Uni.KeyboardDevice())); ======= devices.Add(new DeviceContainer(new Devices.Ducky.DuckyDevice())); //Ducky Device >>>>>>> devices.Add(new DeviceContainer(new Devices.Uni.KeyboardDevice())); d...
<<<<<<< if (!variable.IsEvaluated()) variable.Evaluate(); return variable.GetValue(); ======= lock (locker) { if (!variable.IsEvaluated()) { var stopWatch = new Stopwatch(); stopWat...
<<<<<<< using NBi.Framework.FailureMessage.Markdown; ======= using NBi.Core.ResultSet.Resolver.Query; >>>>>>> using NBi.Framework.FailureMessage.Markdown; using NBi.Core.ResultSet.Resolver.Query;
<<<<<<< public ISequenceResolver Resolver { get; set; } ======= public ISequenceResolver<object> Resolver { get; set; } public IEnumerable<string> Categories { get; set; } = new List<string>(); public IDictionary<string, string> Traits { get; set; } = new Dictionary<string, string>();...
<<<<<<< /// <summary>FFXIV_ACT_Plugin.MemoryScanSettings</summary> private dynamic pluginConfig; /// <summary>FFXIV_ACT_Plugin.Memory.Memory</summary> private dynamic pluginMemory; /// <summary>FFXIV_ACT_Plugin.Memory.ScanCombatants</summary> private dynamic pluginScanc...
<<<<<<< var regex = CodeCommentHelper.GetCommentRegex("CSharp", !string.IsNullOrEmpty(prefix)); var formatter = new CommentFormatter(line, prefix, 4, regex); ======= var regex = CodeCommentHelper.GetCommentRegex(CodeLanguage.CSharp, false); var formatter = new CommentFo...
<<<<<<< ParseAlternativeNode.DownToTop(nodes, RemoveChildrenIfAllChildrenIsEmpty); //ParseAlternativesVisializer.PrintParseAlternatives(parseResult, nodes, skipCount, "After RemoveChildrenIfAllChildrenIsEmpty."); ======= ParseAlternativeNode.TopToDown(nodes, RemoveChildrenIfAllChildrenIsEmpty); ...
<<<<<<< this.menuFileOpenViewer = new System.Windows.Forms.MenuItem(); ======= this.menuObjectBindMoniker = new System.Windows.Forms.MenuItem(); >>>>>>> this.menuFileOpenViewer = new System.Windows.Forms.MenuItem(); this.menuObjectBindMoniker = new System.Windows.Forms...
<<<<<<< this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F); ======= this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); >>>>>>> this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F); <<<<<<< this.ClientSize = new System.Drawing.Size(1920, ...
<<<<<<< ======= using System; >>>>>>>
<<<<<<< public abstract class Doc : IConfigurable, IConfigurationPersistent, IEquatable<Doc>, IEnumerable<Object>, IValidatable, IJSONWritable, IJSONReadable ======= public abstract class Doc : IDataDoc, IJSONWritable >>>>>>> public abstract class Doc : IDataDoc, IJSONWritable, IJSONReadable
<<<<<<< public bool IsValidPrefix(KeySequence sequence) ======= public bool IsValidPrefix(List<Key> sequence, bool ignore_case) >>>>>>> public bool IsValidPrefix(KeySequence sequence, bool ignore_case) <<<<<<< public bool IsValidSequence(KeySequence sequence) ======= public bool IsValidSequenc...
<<<<<<< ======= // Remember when the user touched a key for the last time m_last_key_time = DateTime.Now; // Do nothing if we are disabled if (m_disabled) { return false; } >>>>>>> // Remember when the user touched a key for the last time ...
<<<<<<< else { // This appears to be a non-printable, non-dead key key = new Key(vk); } if (is_keydown) { // Update single key statistics Stats.AddKey(key); // Update key pair statistics if applicable if (D...
<<<<<<< public CityCollection(MapInfo mapInfo, CityInfo[] cities) : base(0, 0) { _mapInfo = mapInfo; _cities = cities; if (FileManager.ClientVersion == ClientVersions.CV_70130) { Add(new GumpPic(5, 5, _mapInfo.Gump, 0)); Add(new GumpPic(0,...
<<<<<<< private TopBarGump _topBarGump; ======= private StaticManager _staticManager; >>>>>>> private TopBarGump _topBarGump; private StaticManager _staticManager; <<<<<<< _topBarGump.Dispose(); ======= Service.Unregister<GameScene>(); >>>>>>> _...
<<<<<<< StbTextBox entry = (StbTextBox) sender; ======= TextBox entry = (TextBox) sender; bool send = false; >>>>>>> StbTextBox entry = (StbTextBox) sender; bool send = false; <<<<<<< entr...