conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
if (length > 0 && _cache.MetaArea.ContainsBlockPointer(pointer, length))
=======
field.DataAddress = pointer;
// Check if the pointer is valid
if (length > 0 && _cache.MetaArea.ContainsPointer(pointer))
>>>>>>>
if (length > 0 && _cache.MetaArea.C... |
<<<<<<<
//// Start Caching Blam Cache MetaData
//var metadataCacheThread = new Thread(BlamCacheMetaData.BeginCachingData);
//metadataCacheThread.Start();
#if !DEBUG
Current.DispatcherUnhandledException += (o, args) =>
{
MetroException.Show(args.Exception);
... |
<<<<<<<
using UnityEngine.Assertions;
=======
using Newtonsoft.Json.Linq;
>>>>>>>
using Newtonsoft.Json.Linq;
using UnityEngine.Assertions;
<<<<<<<
// ReSharper disable once MemberCanBePrivate.Global
// ReSharper disable once InconsistentNaming
=======
public static string InferIDFromJOb... |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
=======
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
>>>>>>>
using System.Diagnostics.CodeAnalysis;
using System.Collections.Generic;
using System.Linq;
using System.Text;
usi... |
<<<<<<<
public string CalculateMD5(string input)
{
var md5 = MD5.Create();
var inputBytes = Encoding.ASCII.GetBytes(input);
var hash = md5.ComputeHash(inputBytes);
var sb = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
... |
<<<<<<<
public Task<TokenResponse> LoginAsync(LoginInput input)
=======
public Task<string> LoginAsync(LoginDto input)
>>>>>>>
public Task<string> LoginAsync(LoginInput input)
<<<<<<<
public Task<TokenResponse> RefreshAsync(RefreshInput input)
=======
public Task<string> Re... |
<<<<<<<
[SerializeField] private DialogueActorChannelSO _startTalking = default;
//UI event
=======
[SerializeField] private DialogueEventChannelSO _startTalking = default;
>>>>>>>
[SerializeField] private DialogueActorChannelSO _startTalking = default;
//UI event
<<<<<<<
case InteractionType.None:
retu... |
<<<<<<<
public GameInput gameInput;
public MenuInputReader Menu { get; private set; }
=======
// Dialogue
public event UnityAction advanceDialogueEvent = delegate { };
public event UnityAction onMoveSelectionEvent = delegate { };
private GameInput gameInput;
>>>>>>>
// Dialogue
public event UnityAction adva... |
<<<<<<<
=======
}
[Fact]
public void ConvexHullAndBoundingRect()
{
Name = "Convex Hull";
var rand = new Random();
// fuzz test
for (int test = 0; test < 50; test++)
{
var basePt = new Vector3((test % 5) * 12... |
<<<<<<<
using System.Net;
using System.Diagnostics;
=======
using Elements.Interfaces;
>>>>>>>
using System.Net;
using Elements.Interfaces;
<<<<<<<
if (!geometricElement.IsElementDefinition)
{
NodeUtilities.CreateNodeForMesh(meshId, nodes, ... |
<<<<<<<
namespace HubSpot.NET.Core
=======
using HubSpot.NET.Api.Company;
using HubSpot.NET.Api.Contact;
using HubSpot.NET.Api.Deal;
using HubSpot.NET.Api.EmailEvents;
using HubSpot.NET.Api.EmailSubscriptions;
using HubSpot.NET.Api.Engagement;
using HubSpot.NET.Api.Files;
using HubSpot.NET.Api.Owner;
using HubSpot.... |
<<<<<<<
public SecretClientOptions(Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion version = Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion.V7_1_Preview) { }
public Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion Version { get { throw null; } }
... |
<<<<<<<
.SetQueryParam("appId", appId);
var data = _client.Execute<T>(path, Method.GET);
=======
.SetQueryParam(QueryParams.APP_ID, appId);
var data = _client.Execute<T>(path, Method.GET, convertToPropertiesSchema: false);
>>>>>>>
.SetQueryParam... |
<<<<<<<
using System.CodeDom.Compiler;
using System.Collections;
=======
>>>>>>>
using System.CodeDom.Compiler;
using System.Collections;
<<<<<<<
private void DeleteAdeptNuget() {
const string folderPath = @"C:\\temp";
const string filesToDelete = "*NuGet*";
... |
<<<<<<<
oxidationModifier = Math.Pow(combinedPresure / GameConstants.EarthAtmospherePressureAtSeaLevel, 0.25);
=======
oxidationModifier = Math.Pow(combinedPressure / 101.325, 0.25);
>>>>>>>
oxidationModifier = Math.Pow(combinedPressure / GameConstants.Eart... |
<<<<<<<
using osuTK;
using osuTK.Input;
=======
using osu.Framework.Input.StateChanges;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
>>>>>>>
using osuTK;
using osuTK.Input;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; |
<<<<<<<
private NSApplicationPresentationOptions presentationOptionsForWindowMode(WindowMode windowMode)
{
switch (windowMode)
{
case Configuration.WindowMode.Fullscreen:
return NSApplicationPresentationOptions.HideDock | NSApplicationPresentat... |
<<<<<<<
/// The direction of the fill. Default is <see cref="FillDirection.Full"/>.
/// If <see cref="FillDirection.Full"/> or <see cref="FillDirection.Horizontal"/>,
/// <see cref="Container{T}.Children"/> are arranged from left-to-right if their
/// <see cref="Drawable.Anchor"/> is to ... |
<<<<<<<
private All filteringMode;
=======
private TextureWrapMode internalWrapMode;
>>>>>>>
private All filteringMode;
private TextureWrapMode internalWrapMode; |
<<<<<<<
=======
using System.Linq;
using System.Diagnostics;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.StateChanges;
using osu.Framework.Input.States;
using osu.Framework.Logging;
>>>>>>> |
<<<<<<<
/// <summary>
/// Retrieves the value after a pivot from an <see cref="IEnumerable{T}"/>.
/// </summary>
/// <typeparam name="T">The type of the items stored in the collection.</typeparam>
/// <param name="collection">The collection to iterate on.</param>
/// <pa... |
<<<<<<<
using osu.Framework.Event;
=======
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
>>>>>>>
using osu.Framework.Event;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States; |
<<<<<<<
#if NET_FRAMEWORK
using System;
using System.Collections.Generic;
using System.Linq;
=======
using System.Threading.Tasks;
>>>>>>>
#if NET_FRAMEWORK
using System;
using System.Collections.Generic;
using System.Linq;
<<<<<<<
#if NET_FRAMEWORK
if (targetThread.IsAlive && clock.ElapsedMil... |
<<<<<<<
using (var convert = GetPageImageForCharacter(character))
using (var buffer = SixLabors.ImageSharp.Configuration.Default.MemoryAllocator.Allocate<byte>(convert.Width * convert.Height))
=======
using (var convert = GetPageImage(page))
>>>>>>>
usi... |
<<<<<<<
case GameWindow _:
{
=======
case OsuTKWindow _:
>>>>>>>
case OsuTKWindow _:
{ |
<<<<<<<
textContent.Text = item.Text.Value;
Item.Text.ValueChanged += newText => textContent.Text = newText;
=======
textContent.Text = item.Text;
Item.Text.ValueChanged += args => textContent.Text = args.NewValue;
>>>>>>>
... |
<<<<<<<
public bool IsScrolledToEnd(float lenience = Precision.FLOAT_EPSILON) => Precision.AlmostBigger(target, ScrollableExtent, lenience);
=======
public bool IsScrolledToEnd(float lenience = Precision.FLOAT_EPSILON) => Precision.AlmostBigger(Target, scrollableExtent, lenience);
>>>>>>>
pub... |
<<<<<<<
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.Left }), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.Right }), new PlatformAction(PlatformActionType.CharNext, Plat... |
<<<<<<<
Parts[i].Texture.DrawQuad(shadowQuad, Depth, shadowColour, vertexAction: vertexAction);
=======
parts[i].Texture.DrawQuad(shadowQuad, finalShadowColour, vertexAction: vertexAction);
>>>>>>>
parts[i].Texture.DrawQuad(shadowQuad, Depth, fi... |
<<<<<<<
private OpenTKKeyboardHandler keyboardHandler = new OpenTKKeyboardHandler();
internal LinuxGameHost(GraphicsContextFlags flags, string gameName)
=======
internal LinuxGameHost(GraphicsContextFlags flags, string gameName, bool bindIPC = false) : base(bindIPC)
>>>>>>>
priva... |
<<<<<<<
Size = new Vector2(FixedWidth ? constantWidth.GetValueOrDefault() : s.DrawSize.X, 1f),
Scale = new Vector2(TextSize),
Children = new[] { s }
=======
Size = new Vector2(FixedWidth ? constantWidth.Get... |
<<<<<<<
public TrackStore Tracks => GetTrackStore();
=======
public IAdjustableResourceStore<Track.Track> Tracks => GetTrackStore();
>>>>>>>
public IAdjustableResourceStore<Track.Track> Tracks => GetTrackStore();
<<<<<<<
public SampleStore Samples => GetSampleStore();
=======
... |
<<<<<<<
Blit(ScreenSpaceDrawQuad, vertexAction);
=======
Shader.Bind();
Blit(vertexAction);
>>>>>>>
Shader.Bind();
Blit(ScreenSpaceDrawQuad, vertexAction); |
<<<<<<<
ClickedDrawable = PropagateMouseButtonEvent(drawables, new ClickEvent(state, Button, MouseDownPosition));
=======
var clicked = intersectingQueue.FirstOrDefault(t => t.CanReceiveMouseInput && t.ReceiveMouseInputAt(state.Mouse.Position) && t.TriggerOnClick(state));
ClickedD... |
<<<<<<<
rateAdjustSlider.Current.BindTo(browser.PlaybackRate);
rateAdjustSlider.Current.BindValueChanged(args => rateText.Text = args.To.ToString("0%"), true);
=======
rateAdjustSlider.Current.BindValueChanged(v => rateText.Text = v.ToString("0%"), true);
>>>>>>>
rateA... |
<<<<<<<
var value = field.GetValue(target);
dc.CacheAs(attribute.Type ?? value.GetType(), value, allowValueTypes);
});
=======
additionActivators.Add((target, dc) =>
{
var value = field.GetValue(tar... |
<<<<<<<
using osu.Framework.Platform.Linux.Sdl;
=======
using OpenTK;
>>>>>>>
using osu.Framework.Platform.Linux.Sdl;
using OpenTK; |
<<<<<<<
Commit();
=======
if (ReleaseFocusOnCommit)
killFocus();
Background.Colour = ReleaseFocusOnCommit ? BackgroundUnfocused : BackgroundFocused;
Background.ClearTransforms();
Background.Fla... |
<<<<<<<
public static extern void av_packet_unref(AVPacket* pkt);
[DllImport(dll_name)]
public static extern void av_packet_free(AVPacket** pkt);
=======
private static extern void av_packet_free(AVPacket** pkt);
>>>>>>>
private static extern void av_packet_unref(AVPacket* pk... |
<<<<<<<
if (shallPropagate && source != Parent)
{
var parentInvalidation = invalidation;
// Colour doesn't affect parent's properties
parentInvalidation &= ~Invalidation.Colour;
if (parentInvalidation > 0)
Pare... |
<<<<<<<
using OpenTK.Graphics.ES30;
=======
using OpenTK.Graphics.ES20;
using osu.Framework.Graphics.Batches;
using osu.Framework.Graphics.OpenGL;
>>>>>>>
using OpenTK.Graphics.ES30;
using osu.Framework.Graphics.Batches;
using osu.Framework.Graphics.OpenGL; |
<<<<<<<
PossiblyHandleKeyboardInput = HandleInputCache.HandleKeyboardInput(this) || HandleKeyboardInput;
PossiblyHandleMouseInput = HandleInputCache.HandleMouseInput(this) || HandleMouseInput;
PossiblyHandleInputSubtree = PossiblyHandleKeyboardInput;
=======
handleNonP... |
<<<<<<<
using osu.Framework.Input;
using osu.Framework.Input.EventArgs;
=======
using osu.Framework.Input.Events;
>>>>>>>
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Input.States;
<<<<<<<
StyledDropdown styledDropdown, styledDropdownMenu2, keyboardInputDropdown1, key... |
<<<<<<<
=======
frame = ffmpeg.av_frame_alloc();
ffmpegFrame = ffmpeg.av_frame_alloc();
uncompressedFrameSize = ffmpeg.av_image_get_buffer_size(AVPixelFormat.AV_PIX_FMT_RGBA, codecParams.width, codecParams.height, 1);
frameRgbBufferPtr =... |
<<<<<<<
using osuTK;
using osuTK.Input;
=======
using osu.Framework.Input.StateChanges;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
>>>>>>>
using osuTK;
using osuTK.Input;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; |
<<<<<<<
public Transform resetPos;
public Transform resetScene;
public Transform home;
public Transform menus;
public Transform matryx;
private Vector3 idleScale, selectedScale;
=======
>>>>>>>
<<<<<<<
base.Start();
selectedScale = new Vector3(0.05f, 0.001f, 0.05f);
... |
<<<<<<<
IsNullOrEmpty(filter.DimensionFilters) ? string.Empty : "(" + GenerateMetricDimensionFilterString(filter.DimensionFilters) + ") and ",
filter.TimeGrain.To8601String(),
=======
filter.Names == null || !filter.Names.Any() ? string.Empty : "(" + GenerateMetricDefin... |
<<<<<<<
public override void SetData(ITextureUpload upload, WrapMode? wrapModeS = null, WrapMode? wrapModeT = null, Opacity? uploadOpacity = null)
=======
internal override void SetData(ITextureUpload upload, WrapMode wrapModeS, WrapMode wrapModeT)
>>>>>>>
internal override void SetData(IText... |
<<<<<<<
using Size = OpenTK.Size;
using Point = OpenTK.Point;
=======
using OpenTK.Graphics;
>>>>>>>
using OpenTK.Graphics;
using Size = OpenTK.Size;
using Point = OpenTK.Point; |
<<<<<<<
queueLock.EnterWriteLock();
try
{
queue.Enqueue(item);
}
finally
{
queueLock.ExitWriteLock();
}
=======
if (!queue.Any(x => x.Urls == item.Urls) && (ItemBeingProcessed== null || Ite... |
<<<<<<<
x = Context.FromPixels(y);
#elif __TIZEN__
=======
y = Context.FromPixels(y);
#elif TIZEN4_0
>>>>>>>
y = Context.FromPixels(y);
#elif __TIZEN__ |
<<<<<<<
public void DrawBitmapNinePatch (SKBitmap bitmap, SKRectI center, SKRect dst, SKPaint paint = null)
{
if (bitmap == null)
throw new ArgumentNullException (nameof (bitmap));
// the "center" rect must fit inside the bitmap "rect"
if (!SKRect.Create (bitmap.Info.Size).Contains (center))
throw ... |
<<<<<<<
BindableProperty.Create("HasRenderLoop", typeof(bool), typeof(SKGLView), false);
public static readonly BindableProperty EnableTouchEventsProperty =
BindableProperty.Create(nameof(EnableTouchEvents), typeof(bool), typeof(SKCanvasView), false);
=======
BindableProperty.Create(nameof(HasRenderLoop),... |
<<<<<<<
using System.Linq;
using Xunit;
=======
using NUnit.Framework;
>>>>>>>
using System.Linq;
using NUnit.Framework; |
<<<<<<<
=======
using Showcase.Server.Api.Controllers.Base;
using Showcase.Server.Infrastructure.Extensions;
>>>>>>>
using Showcase.Server.Api.Controllers.Base; |
<<<<<<<
=======
using Showcase.Server.Api.Controllers.Base;
using Showcase.Server.Infrastructure.Extensions;
>>>>>>>
using Showcase.Server.Api.Controllers.Base; |
<<<<<<<
using System.ComponentModel;
=======
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
>>>>>>>
using System.ComponentModel.DataAnnotations; |
<<<<<<<
return renderer.Writer.ToString();
=======
string html = renderer.Writer.ToString()!;
pipeline.ReleaseCacheableHtmlRenderer(renderer);
return html;
}
/// <summary>
/// Converts a Markdown document to HTML.
/// </summary>
... |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.CompositeType.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGeneric... |
<<<<<<<
// parameter locations
this.RetrofitParameters.ForEach(p =>
{
string locationImport = p.Location.ImportFrom();
if (!string.IsNullOrEmpty(locationImport))
{
imports.Add(p.Location.I... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse> PutPositiveDurationWithHttpMessagesAsync(TimeSpan? durationBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken ... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamIntegerWithHttpMessagesAsync(string scenario, int? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken can... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Pet>> GetPetByIdWithHttpMessagesAsync(long? petId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToke... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Product>> ValidationOfMethodParametersWithHttpMessagesAsync(string resourceGroupName, int? id, Dictionary<string, List<string>> customHeader... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> EnumValidWithHttpMessagesAsync(UriColor? enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationTok... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerParameterWithHttpMessagesAsync(int? bodyParameter, Dictionary<string, List<string>> customHeaders = null, Cancell... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = de... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = de... |
<<<<<<<
settings.Validate(codeGenerator);
=======
>>>>>>> |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationT... |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMaxDateWithHttpMessagesAsync(DateTime? dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationTo... |
<<<<<<<
public CellParts(string value, int width, Alignment alignment)
=======
internal CellParts(string value, int width)
>>>>>>>
internal CellParts(string value, int width, Alignment alignment)
<<<<<<<
public int ColMaxWidth { get; set; }
public ... |
<<<<<<<
bool GridLinesVisible { get; set; }
=======
void ScrollToRow (int row);
>>>>>>>
void ScrollToRow (int row);
bool GridLinesVisible { get; set; } |
<<<<<<<
=======
using MonoMac.CoreText;
using MonoMac.CoreGraphics;
using Xwt.Engine;
>>>>>>>
using MonoMac.CoreText;
using MonoMac.CoreGraphics;
using Xwt.Engine;
<<<<<<<
li.Font = (NSFont)Toolkit.GetBackend (font);
UpdateInfo (li);
=======
li.Font = (NSFont)WidgetRegistry.GetBackend (font);
Invalid... |
<<<<<<<
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
Pango.Layout tl = (Pango.Layout) backend;
var attrList = new FastPangoAttrList ();
// TODO: UTF-8 coordinate transformation.
foreach (var textAttr in textAttributes) {
var fg = textAttr as ... |
<<<<<<<
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
throw new NotImplementedException ();
}
=======
public override Rectangle GetExtendsFromIndex (object backend, int index)
{
throw new NotImplementedException ();
}
>>>>>>>
public override v... |
<<<<<<<
public void SetTextAttributes(params TextAttribute[] textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
public void SetTextAttributes(IEnumerable<TextAttribute> textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
=======
/// <summary>
/// Con... |
<<<<<<<
=======
#region Constructors
/// <summary>
/// Initializes a new instance of the <see cref="TwitterRateLimitStatus"/> class.
/// </summary>
public TwitterRateLimitStatus()
{
}
/// <summary>
/// Initializes a new instance of the <see cref... |
<<<<<<<
=======
rules.GrantToRoles.Each(role =>
{
writer.WriteLine($"GRANT SELECT ({Columns.Select(x => x.Name).Join(", ")}) ON TABLE {Table.QualifiedName} TO \"{role}\";");
});
writer.WriteLine(this.OriginStatement());
>>>>>>>
writer.Writ... |
<<<<<<<
int id;
if (int.TryParse(word, NumberStyles.Integer, CultureInfo.InvariantCulture, out id))
{
var vehicle = BaseVehicle.Find(id);
if (vehicle != null)
{
output = vehicle;
commandText = com... |
<<<<<<<
if (ioDoneEvent.CurrentCount == 0)
ioDoneEvent.Reset(1);
else
ioDoneEvent.AddCount();
//How to read from Queue while writing to disk?
=======
>>>>>>>
if (ioDoneEvent.CurrentCount == 0)
ioDoneEvent.Reset(1);
else
ioDoneEvent.AddCount(); |
<<<<<<<
using Sitecore.Feature.Accounts.Texts;
using Sitecore.Foundation.Alerts.Extensions;
using Sitecore.Foundation.Alerts.Models;
=======
using Sitecore.Foundation.Dictionary.Repositories;
>>>>>>>
using Sitecore.Foundation.Dictionary.Repositories;
using Sitecore.Foundation.Alerts.Extensions;
using S... |
<<<<<<<
[AutoDbData]
public void RestorePassword_ValidUser_ShouldCallResetPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
=======
[AutoFakeUserData]
public void RestorePasswordShouldCallResetPassword(FakeMembershipUser user, MembershipProvider membershi... |
<<<<<<<
//bool waitingReload = true;
public void OnGUI()
=======
int patchCount = 0;
public void Update()
>>>>>>>
int patchCount = 0;
public void Update()
<<<<<<<
if (currentAssembly.Location != a.path)
candidates += "Ve... |
<<<<<<<
this.contextMenuStrip.Size = new System.Drawing.Size(150, 120);
this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
=======
this.contextMenuStrip.Size = new System.Drawing.Size(153, 142);
>>>>>>>
this.co... |
<<<<<<<
}
return image;
}
/// <summary>
/// Returns the correct <see cref="Size"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
... |
<<<<<<<
}
return image;
}
/// <summary>
/// Returns the correct <see cref="Size"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
... |
<<<<<<<
/// <summary />
protected MvpPage()
{
AutoDataBind = true;
}
/// <summary>
/// Gets a value indicating whether the page should automatically data bind itself at the Page.PreRenderComplete event.
/// </summary>
/// <value><c>true</c> if... |
<<<<<<<
=======
using Metrics;
using Metrics.Json;
using Metrics.Reporters;
using Metrics.Utils;
using Metrics.Visualization;
>>>>>>>
using Metrics;
using Metrics.Json;
using Metrics.Reporters;
using Metrics.Utils;
using Metrics.Visualization; |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
using Metrics.Utils;
>>>>>>>
using Metrics;
using System.Text.RegularExpressions;
using Metrics.Utils;
<<<<<<<
public TimerForEachRequestMiddleware(MetricsRegistry registry, string metricPrefix, Regex[] ignorePatterns)
: base(i... |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
>>>>>>>
using Metrics.Core;
<<<<<<<
public ActiveRequestCounterMiddleware(MetricsRegistry registry, string metricName, Regex[] ignorePatterns)
: base(ignorePatterns)
=======
public ActiveRequestCounterMiddleware(Metri... |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
>>>>>>>
using Metrics;
using System.Text.RegularExpressions;
<<<<<<<
public PostAndPutRequestSizeHistogramMiddleware(MetricsRegistry registry, string metricName, Regex[] ignorePatterns)
: base(ignorePatterns)
=======
... |
<<<<<<<
kernel.Bind<IPaths>().To<UacCompliantPaths>().InSingletonScope();
kernel.Bind<IParser>().To<Common.CommandLine.Parser>();
=======
>>>>>>>
kernel.Bind<IParser>().To<Common.CommandLine.Parser>(); |
<<<<<<<
_npcMonsters[npcMonster.NpcMonsterVNum] = npcMonster as NpcMonster;
});
_npcs.AddRange(_npcMonsters.GetAllItems());
=======
NpcMonster npc = npcmonsterDTO as NpcMonster;
npc.BCards = new List<BCard>();
DAOFactory.BCardDAO.... |
<<<<<<<
using AsmResolver.DotNet.Signatures.Types.Parsing;
=======
using System.Reflection;
>>>>>>>
using System.Reflection;
using AsmResolver.DotNet.Signatures.Types.Parsing; |
<<<<<<<
return new SerializedPEFile(reader, mode);
=======
// DOS header.
var dosHeader = DosHeader.FromReader(reader);
reader.FileOffset = dosHeader.NextHeaderOffset;
uint signature = reader.ReadUInt32();
if (signature != ValidPESignature)
... |
<<<<<<<
/// データセットをローカルコピーするか否か。
/// true：ローカルコピーする false：ローカルコピーしない(シンボリックリンクを作成する)
/// </summary>
public bool LocalDataSet { get; set; }
/// <summary>
=======
/// エントリポイント。
/// ノートブック起動時に実行されるスクリプト。
/// </summary>
public string EntryPoint { ge... |
<<<<<<<
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
namespace Nssol.Platypus.ApiModels.TrainingApiModels
=======
namespace Nssol.Platypus.ApiModels.TrainingApiModels
>>>>>>>
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
namespace Nssol.Platypus.ApiModels.TrainingApiMode... |
<<<<<<<
Tags = history.Tags;
=======
if (history.ParentMaps != null && history.ParentMaps.Count > 0)
{
List<string> parentFullNameList = new List<string>();
foreach (TrainingHistoryParentMap parentMap in history.ParentMaps)
{
... |
<<<<<<<
public async Task<IActionResult> DeleteTenantAsync(long id)
=======
public async Task<IActionResult> DeleteTenantAsync(long id, [FromBody] DeleteInputModel model, [FromServices] INodeRepository nodeRepository)
>>>>>>>
public async Task<IActionResult> DeleteTenantAsync(long id, [FromSe... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.