conflict_resolution
stringlengths
27
16k
<<<<<<< public bool waitDecline { get; set; } ======= public int MinimumDelay { get; set; } >>>>>>> public bool waitDecline { get; set; } public int MinimumDelay { get; set; } <<<<<<< minStandings = 10; ======= MinimumDelay = 0; >>>>>>> MinimumDelay = 0; ...
<<<<<<< _questor = new Questor(this); ======= _questor = new Questor(); LavishScript.Commands.AddCommand("SetAutoStart", SetAutoStart); LavishScript.Commands.AddCommand("SetDisable3D", SetDisable3D); LavishScript.Commands.AddCommand("SetExitWhenIdle", SetEx...
<<<<<<< // // create HMAC signature using this registration key // var secretKeyBase64ByteArray = Convert.FromBase64String(base64key); // string signature = ""; // using ( HMACSHA256 hmac = new HMACSHA256(secretKeyBase64Byte...
<<<<<<< Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, string.Empty); ======= Environment.SetEnvironmentVariable(EnvUtil.PpeHostsEnvVar, string.Empty); >>>>>>> Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, string.Empty); Environment.SetEn...
<<<<<<< private System.Windows.Forms.CheckBox chkLastSeenImage; ======= private System.Windows.Forms.CheckBox chkHorzCenterToolbarBtns; >>>>>>> private System.Windows.Forms.CheckBox chkLastSeenImage; private System.Windows.Forms.CheckBox chkHorzCenterToolbarBtns;
<<<<<<< private System.Windows.Forms.LinkLabel lnkConfigDir; ======= private System.Windows.Forms.CheckBox chkHorzCenterToolbarBtns; >>>>>>> private System.Windows.Forms.LinkLabel lnkConfigDir; private System.Windows.Forms.CheckBox chkHorzCenterToolbarBtns;
<<<<<<< NetApiBufferFree(intPtr); foreach (var sess in toReturn.Distinct()) ======= foreach (var user in users.Distinct()) >>>>>>> NetApiBufferFree(intPtr); foreach (var user in users.Distinct())
<<<<<<< this.tabPageTimeline = new System.Windows.Forms.TabPage(); this.timelineView1 = new AdamsLair.WinForms.TimelineControls.TimelineView(); ======= >>>>>>> this.tabPageTimeline = new System.Windows.Forms.TabPage(); this.timelineView1 = new AdamsLair.WinForms.TimelineControls.TimelineView(); <<<<<<< ...
<<<<<<< lbl_totalCommentsInGrid.Invoke((MethodInvoker)delegate { lbl_totalCommentsInGrid.Text = "Total Row Count: 0"; }); ProgressSpinner_LoadComments.Invoke((MethodInvoker)delegate { ProgressSpinner_LoadComments.Visible = true;...
<<<<<<< class cmts { public string CommentContent { get; set; } public string Author { get; set; } public string Time { get; set; } } Dictionary<string, cmts> myList = new Dictionary<string, cmts>(); ======= >>>>>>> cl...
<<<<<<< var mapping = events.Expect<MappingStart>(); Load(mapping, state); ======= MappingStart mapping = parser.Expect<MappingStart>(); base.Load(mapping, state); >>>>>>> var mapping = parser.Expect<MappingStart>(); Load(mapping, state); <<<<<...
<<<<<<< Assert.True(error, "Unexpected spec failure.\nExpected:\n" + expectedResult + "\nActual:\n[Writer Output]\n" + writer + "\n[Exception]\n" + ex); Debug.Assert(!(error && knownFalsePositives.Contains(name)), $"Spec test '{name}' passed but present in '{nameof(knownFalsePosi...
<<<<<<< CollectionNodeDeserializer.DeserializeHelper(itemType, reader, nestedObjectDeserializer, items, true); ======= CollectionNodeDeserializer.DeserializeHelper(itemType, parser, expectedType, nestedObjectDeserializer, items, true); >>>>>>> CollectionNodeDeserializer.Deserializ...
<<<<<<< var sequence = events.Expect<SequenceStart>(); Load(sequence, state); ======= SequenceStart sequence = parser.Expect<SequenceStart>(); base.Load(sequence, state); >>>>>>> var sequence = parser.Expect<SequenceStart>(); Load(sequence, stat...
<<<<<<< using YamlDotNet.Core; ======= using YamlDotNet.RepresentationModel.Serialization.NamingConventions; >>>>>>> using YamlDotNet.Core; using YamlDotNet.RepresentationModel.Serialization.NamingConventions; <<<<<<< ======= [Fact] public void DeserializeEnumerable() { Z[] z = new[] { new Z() { aaa = ...
<<<<<<< public int port = 2076; public int httpPort = 8081; public int maxClients = 8; public float updatesPerSecond = 60; public int screenshotInterval = 3000; public bool autoRestart = false; public bool autoHost = false; public bool saveScreenshots = false; public String joinMessage = String.Empty;...
<<<<<<< var result = await client.Subscriptions.ListAsync().ConfigureAwait(false); subscriptions = result.Subscriptions.Select(sub => new Subscription { SubscriptionId = sub.SubscriptionId, DisplayName = sub.DisplayName }).ToList(); ======= var subscriptionsResult = aw...
<<<<<<< Action<Socket> receiveClient; Socket listenSocket; ======= Action<Socket> receiveClient; Socket listener; >>>>>>> Action<Socket> receiveClient; Socket listenSocket; <<<<<<< listenSocket.Listen(100); // post accepts on the listening soc...
<<<<<<< public static EntityOperationSettings<T> GetEntitySettings<T>(IEntityOperationSymbolContainer<T> operation) where T : class, IEntity ======= public static void ReplaceSetting(OperationSettings setting) { Manager.Settings.GetOrAddDefinition(setting.OverridenType)[setting.Ope...
<<<<<<< #line 25 "..\..\Signum\Views\SearchControl.cshtml" Write(QueryUtils.GetKey(findOptions.QueryName)); ======= #line 28 "..\..\Signum\Views\SearchControl.cshtml" Write(QueryUtils.GetQueryUniqueKey(findOptions.QueryName)); >>>>>>> #line 28 "..\....
<<<<<<< public static int UnsafeDeleteChunks<T>(this IQueryable<T> query, int chunkSize = 10000) where T : Entity ======= public static int UnsafeDeleteChunks<T>(this IQueryable<T> query, int chunkSize = 10000, int maxQueries = int.MaxValue) where T : IdentifiableEntity >>>>>>> ...
<<<<<<< public static string ToTsvFile<T>(this IEnumerable<T> collection, string fileName, Encoding? encoding = null, bool writeHeaders = true, bool autoFlush = false, bool append = false, Func<TsvColumnInfo<T>, Func<object, string>>? toStringFactory = null) ======= public static string To...
<<<<<<< using(AvoidCache()) { SemiSymbol.SetSemiSymbolIds<T>(Database.RetrieveAll<T>().Where(a => a.Key.HasText()).ToDictionary(a => a.Key, a => a.Id)); return getSemiSymbols().ToDictionary(a => a.Key); } ======...
<<<<<<< return new SqlPreCommandSimple($"ALTER TABLE {table.Name} SET (SYSTEM_VERSIONING = ON (HISTORY_TABLE = {table.SystemVersioned!.TableName.OnDatabase(null)}))"); ======= return new SqlPreCommandSimple($"ALTER TABLE {table.Name} DROP PERIOD FOR SYSTEM_TIME;"); >>>>>>> return ...
<<<<<<< var expr = Expression.Lambda<Func<Entity, Forbidden, string, List<DbParameter>>>( CreateBlock(trios.Select(a => a.ParameterBuilder), assigments), paramIdent, paramForbidden, paramPostfix); ======= var expr = Expression.Lambda<Func<IdentifiableEnt...
<<<<<<< public ICoreTransaction Parent { get { return parent; } } ======= public event Action Rolledback { add { parent.Rolledback += value; } remove { parent.Rolledback -= value; } } >>>>>>> ...
<<<<<<< // private static JsonSchema metadata_schema; // private static string metadata_schema_path = "CKAN.schema"; // private static bool metadata_schema_missing_warning_fired; [JsonProperty("install")] public ModuleInstallDescriptor[] install; [JsonPrope...
<<<<<<< public abstract bool AllowsSetSnapshotIsolation { get; } public abstract void FixType(ref SqlDbType type, ref int? size, ref int? scale); public abstract bool AllowsIndexWithWhere(string where); public abstract SqlPreCommand ShringDatabase(string schemaName); public ...
<<<<<<< (i, dix) => dix.Columns.Any(removedColums.Contains) || dix.IsControlledIndex && SafeConsole.Ask(ref removeExtraControlledIndexes, "Remove extra controlled index {0} in {1}?".FormatWith(dix.IndexName, tab.Name)) ? SqlBuilder.DropIndex(dif.Name, dix) : null, ...
<<<<<<< (i, dix) => dix.IsControlledIndex && SafeConsole.Ask(ref removeExtraControlledIndexes, "Remove extra controlled index {0} in {1}?".FormatWith(dix.IndexName, tab.Name)) || dix.Columns.Any(removedColums.Contains) ? SqlBuilder.DropIndex(dif.Name, dix) : null, ...
<<<<<<< static ConcurrentDictionary<Assembly, DateTime> CompilationDatesCache = new ConcurrentDictionary<Assembly, DateTime>(); public static DateTime CompilationDate(this Assembly assembly) { return CompilationDatesCache.GetOrAdd(assembly, a => { stri...
<<<<<<< DropTable(diffTable.Name), DropTable(diffTable.TemporalTableName) )!; ======= DropTable(diffTable.Name) //DropTable(diffTable.TemporalTableName) ); >>>>>>> DropTable(diffTable.Name) //DropT...
<<<<<<< // 2. Protect against IFRAME attack // app.UseXFrame(); // 3. Migrate OpenId database. if (options.DataSource.IsOpenIdDataMigrated) { using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateS...
<<<<<<< private TelemetryDiagnosticSourceListener telemetryDiagnosticSourceListener; #endif ======= >>>>>>> private TelemetryDiagnosticSourceListener telemetryDiagnosticSourceListener; <<<<<<< this.telemetryDiagnosticSourceListener = new TelemetryDiagnosticSourceListener...
<<<<<<< public PerformanceCounterStructure CreateCounter( ======= public void RemoveCounter(string perfCounter, string reportAs) { this.counters.RemoveAll( counter => string.Equals(counter.Item1.ReportAs, reportAs, StringComparison.Ordinal) ...
<<<<<<< /// <summary> /// The default color mapping. /// </summary> private OxyColor defaultColorMapping(HistogramItem item) => ActualFillColor; ======= >>>>>>> /// <summary> /// The default color mapping. /// </summary> private OxyColor defaultColo...
<<<<<<< if ( (System.String.Compare (arg.ToUpperInvariant (), "--HELP", System.StringComparison.Ordinal) == 0) || (System.String.Compare (arg.ToUpperInvariant (), "-H", System.StringComparison.Ordinal) == 0)) ...
<<<<<<< ======= >>>>>>> <<<<<<< private static T Deserialize<T>() where T : class ======= private static T Deserialize<T>() where T : class { return Deserialize<T>(10); } private static T Deserialize<T>(int version) where T : class >>>>>>> private st...
<<<<<<< int velocityResolution = 32; int angleOfAttackResolution = 32; int altitudeResolution = 32; ======= int velocityResolution = 64; int angleOfAttackResolution = 32; int altitudeResolution = 32; >>>>>>> int velocityResolution = ...
<<<<<<< if (KSPManager.CurrentInstance != null) { User.WriteLine("Using KSP installation at \"{0}\"", KSPManager.CurrentInstance.GameDir()); } ======= if (ksp == null) { User.WriteLine("I don't know where KSP is in...
<<<<<<< using System.Collections.Generic; using System.Linq; ======= using System.ComponentModel.DataAnnotations; >>>>>>> using System.Collections.Generic; using System.Linq; using System.ComponentModel.DataAnnotations;
<<<<<<< ======= moduleSymbols.OpenSymbolTable(); Profiler.BeginSample("Visit"); >>>>>>> moduleSymbols.OpenSymbolTable();
<<<<<<< BindableProperty.Create(nameof(LowerValue), typeof(float), typeof(RangeSlider), 0f); ======= BindableProperty.Create(LowerValuePropertyName, typeof(float), typeof(RangeSlider), 0f, defaultBindingMode: BindingMode.TwoWay); >>>>>>> BindableProperty.Create(nameof(LowerValue),...
<<<<<<< public class NuggetLocalizerTests { LanguageItem[] languages = LanguageItem.ParseHttpLanguageHeader("en"); [TestMethod] public void NuggetLocalizer_can_process_nugget_singleline() { ITextLocalizer textLocalizer = new TextLocalizer_Mockup("xxx", "yyy"); ...
<<<<<<< protected Uri _FoldersUri = new Uri(Constants.FoldersEndpointString); ======= protected Uri _FilesUri = new Uri(Constants.FilesEndpointString); >>>>>>> protected Uri _FoldersUri = new Uri(Constants.FoldersEndpointString); protected Uri _FilesUri = new Uri(Constants.FilesEndpoi...
<<<<<<< [TestMethod] public async Task DeleteFile_ValidResponse_FileDeleted() { /*** Arrange ***/ string responseString = ""; _handler.Setup(h => h.ExecuteAsync<BoxFile>(It.IsAny<IBoxRequest>())) .Returns(Task.FromResult<IBoxResponse<BoxFile>>...
<<<<<<< [TestMethod] public async Task DownloadStream_ValidResponse_ValidStream() { using (FileStream exampleFile = new FileStream(string.Format(getSaveFolderPath(), "example.png"), FileMode.OpenOrCreate)) { /*** Arrange ***/ Uri location...
<<<<<<< ======= protected Uri _FoldersUri = new Uri(Constants.FoldersEndpointString); >>>>>>> protected Uri _FoldersUri = new Uri(Constants.FoldersEndpointString); <<<<<<< _config.SetupGet(x => x.CollaborationsEndpointUri).Returns(new Uri(Constants.CollaborationsEndpointString));...
<<<<<<< // private static JsonSchema metadata_schema; // private static string metadata_schema_path = "CKAN.schema"; // private static bool metadata_schema_missing_warning_fired; [JsonProperty("install")] public ModuleInstallDescriptor[] install; [JsonPrope...
<<<<<<< case Constants.TypeMetadataTemplate: return new BoxMetadataTemplate(); ======= case Constants.TypeTermsOfService: return new BoxTermsOfService(); case Constants.TypeTermsOfServiceUserStatuses: ...
<<<<<<< /// <summary> /// min zoom /// </summary> [Category("GMap.NET")] [Description("minimum zoom level of map")] public int MinZoom { get { return Core.minZoom; } set { ...
<<<<<<< if(map.ScaleMode == ScaleModes.Fractional && remainder != 0 && map.ActualWidth > 0) { ======= if(Math.Abs(remainder) > 0.00001 && map.ActualWidth > 0) { bool scaleDown; switch (GMaps.Instance.MapFloatScaleMode) { ...
<<<<<<< // private static JsonSchema metadata_schema; // private static string metadata_schema_path = "CKAN.schema"; // private static bool metadata_schema_missing_warning_fired; [JsonProperty("bundles")] public dynamic[] bundles; [JsonProperty("install")] public dynamic[] install; ...
<<<<<<< [assembly:AssemblyVersion("14.0.0.9055")] // The assembly version for THE OSS BUILD [assembly:AssemblyFileVersion("14.0.0.9055")] ======= [assembly:AssemblyVersion("12.0.0.9055")] // The assembly version for THE OSS BUILD [assembly:AssemblyFileVersion("12.0.0.9055")] [assembly: CLSCompliant(true)...
<<<<<<< using System.Threading.Tasks; using System.Windows; ======= using Cama.Application.Commands.Mutation.ExecuteMutations; >>>>>>> using System.Threading.Tasks; using Cama.Application.Commands.Mutation.ExecuteMutations; <<<<<<< await Task.Run(() => _commandDispatcher.ExecuteCommandAsync( ...
<<<<<<< CIRCULARIZE, PERIAPSIS, APOAPSIS, ELLIPTICIZE, SEMI_MAJOR, INCLINATION, PLANE, TRANSFER, MOON_RETURN, INTERPLANETARY_TRANSFER, COURSE_CORRECTION, LAMBERT, KILL_RELVEL, RESONANT_ORBIT ======= CIRCULARIZE, PERIAPSIS, APOAPSIS, ELLIPTICIZE, INCLINATION, PLANE, TRANSFER, MOON_R...
<<<<<<< protected InlineAutoDataAttribute(AutoDataAttribute autoDataAttribute, params object[] values) ======= /// <remarks> /// <para> /// This constructor overload exists to enable a derived attribute to /// supply a custom <see cref="AutoDataAttribute" /> that again may ...
<<<<<<< ======= return version = DetectVersion(GameDir()); } internal static KSPVersion DetectVersion(string path) { string readme = ""; try { // Slurp our README into memory readme = File.ReadAllText(Path.Combine...
<<<<<<< using Newtonsoft.Json.Tests.TestObjects.Organization; #if !(NETFX_CORE || DNXCORE50) ======= #if !(DNXCORE50) >>>>>>> using Newtonsoft.Json.Tests.TestObjects.Organization; #if !(DNXCORE50)
<<<<<<< ======= using System.Text.RegularExpressions; >>>>>>> using System.Text.RegularExpressions; <<<<<<< private bool cancelRequested; private object cancelLock = new object(); private bool dryRun; private bool cleanup = true; private string batchJournalPath; priva...
<<<<<<< using SqlKata.Compilers.Bindings; ======= using System.Reflection; using System.Text; >>>>>>> using SqlKata.Compilers.Bindings; using System.Text; <<<<<<< return ctx; } public virtual SqlResult Compile(Query query) { var ctx = CompileRaw(query); ...
<<<<<<< .ToDictionary(x => parameterPrefix + x.i, x => x.v); ======= .ToDictionary(x => { variable = GetVariableByName(withVarClauses, x.v); return (variable != null) ? x.v.ToString() : ...
<<<<<<< string path = Path.GetDirectoryName(i.FilePath); string directory = path.Substring(path.LastIndexOf("\\", StringComparison.Ordinal) + 1); ======= string path = PathHelper.GetDirectoryName(i.FilePath); string directory = path.Substring(path.LastIn...
<<<<<<< this.RaiseSubscriptionAdding(remoteSubscriber, options); IWampClientProxy<TMessage> client = request.Client; ======= IWampClient<TMessage> client = request.Client; >>>>>>> IWampClientProxy<TMessage> client = request.Client; <<<<<<< mClient = c...
<<<<<<< private readonly IWampEventSerializer mEventSerializer; ======= private readonly ILogger mLogger; private readonly IWampEventSerializer<TMessage> mEventSerializer; >>>>>>> private readonly IWampEventSerializer mEventSerializer; private readonly ILogger mLogger;
<<<<<<< private readonly ActionBlock<WampMessage<object>> mSendBlock; ======= private readonly ActionBlock<WampMessage<TMessage>> mSendBlock; protected readonly ILogger mLogger; >>>>>>> private readonly ActionBlock<WampMessage<object>> mSendBlock; protected readonly ILogger mL...
<<<<<<< using Newtonsoft.Json.Tests.TestObjects.Organization; #if NETFX_CORE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; ...
<<<<<<< using System.Buffers; using System.IO; using System.Net.Security; ======= >>>>>>> using System.IO; using System.Net.Security;
<<<<<<< else if (e.CommandType == typeof(PipeCommands.GetVirtualMotionTracker)) { await server.SendCommandAsync(new PipeCommands.SetVirtualMotionTracker { enable = vmtClient.GetEnable(), no = vmtClient.GetNo() ...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< /// <feature>http://tizen.org/feature/usb.host</feature> /// <exception cref="NotSupportedException">The required feature is not supported.</exception>...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< /// <feature>http://tizen.org/feature/usb.host</feature> /// <exception cref="NotSupportedException">The required feature is not supported.</exception>...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< /// <feature>http://tizen.org/feature/usb.host</feature> /// <exception cref="NotSupportedException">The required feature is not supported.</exception>...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< internal readonly UsbInterface _parent; ======= /// <since_tizen> 4 </since_tizen> protected readonly UsbInterface _parent; >>>>>>> ...
<<<<<<< public async Task<List<ISchemaEntity>> GetSchemasAsync(DomainId appId, bool allowDeleted = false) ======= public async Task<List<ISchemaEntity>> GetSchemasAsync(Guid appId) >>>>>>> public async Task<List<ISchemaEntity>> GetSchemasAsync(DomainId appId) <<<<<<< public async Tas...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< /// <feature>http://tizen.org/feature/usb.host</feature> /// <exception cref="NotSupportedException">The required feature is not supported.</exception>...
<<<<<<< using NodaTime; using Squidex.Infrastructure; ======= >>>>>>> using Squidex.Infrastructure; <<<<<<< Task LogAsync(DomainId appId, Instant timestamp, string? requestMethod, string? requestPath, string? userId, string? clientId, long elapsedMs, double costs); ======= Task LogAsync(Guid appId...
<<<<<<< /// <since_tizen> 5 </since_tizen> ======= /// <since_tizen> 4 </since_tizen> >>>>>>> /// <since_tizen> 4 </since_tizen> <<<<<<< /// <feature>http://tizen.org/feature/usb.host</feature> /// <exception cref="NotSupportedException">The required feature is not supported.</exception>...
<<<<<<< /// Enumeration for visible type of scrollbar. /// </summary> /// <since_tizen> preview </since_tizen> public enum ScrollBarVisiblePolicy { /// <summary> /// Show scrollbars as needed /// </summary> Auto = 0, /// <summary> /// Always show scro...
<<<<<<< //get api key from header var headers = Request.Headers; string apikey = ""; IEnumerable<string> headerParams; if (headers.TryGetValues("Auth", out headerParams)) { string[] auth = headerParams.To...
<<<<<<< Description = "The id of the content (usually GUID).", DefaultValue = string.Empty, ResolvedType = AllTypes.NonNullDomainId ======= Description = "The id of the content (GUID).", DefaultValue = null, ...
<<<<<<< if (cancel.IsCancellationRequested) return false; await InstallArchives(); if (cancel.IsCancellationRequested) return false; await InstallIncludedFiles(); if (cancel.IsCancellationRequested) return false; await InstallSteamWorkshopItems(...
<<<<<<< [Reactive] public string ModlistLocation { get; set; } ======= public FilePickerVM Location { get; } >>>>>>> public FilePickerVM ModlistLocation { get; } <<<<<<< this.ModlistLocation = source; ======= this.Location = new FilePickerVM() { ...
<<<<<<< System.Windows.Application.Current.Dispatcher.Invoke(() => ======= if (UseSync) { _appState.dispatcher.Invoke(() => { using (var stream = new HttpClient().GetStreamSync(slide...
<<<<<<< using Cassette.Utilities; #if NET35 using Iesi.Collections.Generic; #endif ======= >>>>>>> #if NET35 using Iesi.Collections.Generic; #endif <<<<<<< class ExternalBundleGenerator : IBundleVisitor { readonly CassetteSettings settings; readonly HashedSet<string> existingUrls; r...
<<<<<<< SetupEnricher(); A.CallTo(() => queryParser.ParseQueryAsync(requestContext, A<Q>._)) ======= A.CallTo(() => queryParser.ParseAsync(requestContext, A<Q>._)) >>>>>>> SetupEnricher(); A.CallTo(() => queryParser.ParseAsync(requestContext, A<Q>._))
<<<<<<< assetUrls.Select(createLink).ToArray() )); if (hasCondition) { html.AppendLine(); html.Append(HtmlConstants.ConditionalCommentEnd); } return html.ToString(); ======= assetUrls.Select(cre...
<<<<<<< using System; using System.Collections.Generic; ======= >>>>>>> using System; using System.Collections.Generic; <<<<<<< public abstract Project UnderlyingProject { get; } public abstract IReadOnlyList<TagHelperDescriptor> TagHelpers { get; } ======= public abstract string FilePath...
<<<<<<< var outputKind = SpanKindInternal.Markup; ======= >>>>>>> <<<<<<< outputKind = SpanKindInternal.Code; ======= >>>>>>> <<<<<<< outputKind = SpanKindInternal.Code; ======= >>>>>>> <<<<<<< outputKind = SpanKindIn...
<<<<<<< using System; using System.Collections.Generic; using System.Globalization; using System.Web.UI; using System.Web.UI.HtmlControls; ======= using System.Collections.Generic; >>>>>>> using System.Collections.Generic; using System.Web.UI; using System.Web.UI.HtmlControls; <<<<<<< using Xpand.ExpressApp.Web....
<<<<<<< Total = result.Contents.Total, Items = result.Contents.Take(200).Select(item => { var itemModel = SimpleMapper.Map(item, new ContentDto()); if (item.Data != null) { itemModel.Data...
<<<<<<< openMEditRegex = true; } if (ImGui.MenuItem("Export CSV (Slow!)", null, false, _selection.paramSelectionExists())) { openMEditCSVExport = true; } if (ImGui.MenuItem("Import CSV", null, false, ...
<<<<<<< using Google.Apis.Util; ======= using Google.Api.Gax; using Google.Api.Gax.Rest; >>>>>>> using Google.Api.Gax; using Google.Apis.Util;
<<<<<<< /// <summary> /// Disposes a lazy-initialized object if the object has already been created. /// </summary> /// <param name="lazy">The lazy initializer containing a disposable object.</param> /// <typeparam name="T">Type of the object that needs to be disposed.</typepara...
<<<<<<< [Fact] public void Query_ForPocoGivenDbColumPocoOverlapSqlStringAndParameters_ShouldReturnValidPocoCollection() { DB.Insert(new PocoOverlapPoco1 { Column1 = "A", Column2 = "B" }); DB.Insert(new PocoOverlapPoco2 { Column1 = "B", Column2 = "A" }); var ...
<<<<<<< ======= using System.Collections.Generic; using System.Reflection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; >>>>>>> using System.Reflection; <<<<<<< return objectType == _baseType; ======= return objectType == _baseType || _supportedTypes.ContainsKey(objectType) || ToType...
<<<<<<< public static readonly IGraphType DomainId = new StringGraphType(); ======= public static readonly IGraphType Long = new LongGraphType(); public static readonly IGraphType Guid = new GuidGraphType(); >>>>>>> public static readonly IGraphType DomainId = new StringGraphType(); ...
<<<<<<< using Terraria_Server.Collections; ======= using Terraria_Server.Definitions; >>>>>>> using Terraria_Server.Collections; using Terraria_Server.Definitions;
<<<<<<< LoginEvent Event = new LoginEvent(); Event.Socket = Netplay.serverSock[i]; Event.Sender = Main.player[i]; ======= PlayerLoginEvent Event = new PlayerLoginEvent(); Event.s...
<<<<<<< private void ShowDamage(double damage, float hitDirection, int goreStart, double lifeModifier = 100d, int type = 5, int alpha = 0, Color color = default(Color)) { if (this.life > 0) { for (int i = 0; (double)i < (damage / (double)this.lifeMax * lifeModifi...
<<<<<<< using Terraria_Server.Collections; ======= using Terraria_Server.Definitions; >>>>>>> using Terraria_Server.Collections; using Terraria_Server.Definitions; <<<<<<< public int Release; public float Scale; public int Shoot; ======= public ProjectileType Shoot; >>>>>>> ...