conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public RiakBucketProperties SetReplicationMode(RiakConstants.RiakEnterprise.ReplicationMode replicationMode)
{
ReplicationMode = replicationMode;
return this;
}
=======
public RiakBucketProperties SetBigVclock(uint? bigVclock)
{
BigV... |
<<<<<<<
=======
private readonly bool _reuseHeaderValues;
private readonly bool _useLatin1;
>>>>>>>
private readonly bool _useLatin1;
<<<<<<<
ReuseHeaderValues = reuseHeaderValues;
=======
_reuseHeaderValues = reuseHeaderValues;
_useLatin1 = useLatin1;
... |
<<<<<<<
#if WINRT
#elif PSS
_graphics.DrawArrays(PSSHelper.ToDrawMode(primitiveType), vertexStart, GetElementCountArray(primitiveType, primitiveCount));
=======
>>>>>>> |
<<<<<<<
static public T Create(string launchParameters, PhoneApplicationPage page, UIElement drawingSurface = null)
=======
///
static public T Create(string launchParameters, PhoneApplicationPage page)
>>>>>>>
///
static public T Create(string launchParameters, PhoneApplica... |
<<<<<<<
#if !DIRECTX
=======
#endif
#if !WINRT
>>>>>>>
#endif
#if !DIRECTX
<<<<<<<
#elif DIRECTX
=======
#elif PSS
throw new NotImplementedException();
#elif WINRT
>>>>>>>
#elif PSS
throw new NotImplementedException();
#elif DIRECTX
<<<<<<<
#elif DIRECTX
throw new NotImple... |
<<<<<<<
#if WINDOWS_MEDIA_ENGINE || WINDOWS_MEDIA_SESSION
=======
#if WINDOWS_MEDIA_ENGINE || WINDOWS_MEDIA_SESSION
using SharpDX;
>>>>>>>
#if WINDOWS_MEDIA_ENGINE || WINDOWS_MEDIA_SESSION
using SharpDX;
<<<<<<<
#elif WINDOWS_PHONE
internal static MediaElement _mediaElement;
=======
private static... |
<<<<<<<
GL.ClearColor(color.X, color.Y, color.Z, color.W);
=======
// GL.Clear() obeys the scissor rectangle where as in XNA/DirectX
// it does not. So make sure scissor rect is set to the viewport
// bounds before we do the clear.
var prevScissorRect = ScissorRe... |
<<<<<<<
if (!reader.GraphicsDevice.GraphicsCapabilities.SupportsS3tc && convertedFormat == SurfaceFormat.Color)
=======
case SurfaceFormat.Dxt3SRgb:
if (!reader.GraphicsDevice.GraphicsCapabilities.SupportsS3tc)
>>>>>>>
case SurfaceFormat.Dxt3SR... |
<<<<<<<
var shaderList = new List<Shader>();
=======
_shaderList = new List<DXShader>();
>>>>>>>
_shaderList = new List<Shader>();
<<<<<<<
var shader = new MGFXShader(graphicsDevice, reader);
shaderList.Add(shader);
=======
var sh... |
<<<<<<<
case 0:
case 5:
TouchPanel.AddEvent(new TouchLocation(id, TouchLocationState.Pressed, position));
=======
case MotionEventActions.Down:
case MotionEventActions.PointerDown:
index = collection.FindIndexById(... |
<<<<<<<
static class FontHelper
{
[StructLayout(LayoutKind.Sequential)]
public struct ABC
{
public int abcA;
public uint abcB;
public int abcC;
}
[DllImport("gdi32.dll", ExactSpelling = true)]
public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObj);
[DllImport("gdi32.dll", ExactSpel... |
<<<<<<<
case SurfaceFormat.RgbaATCExplicitAlpha:
glInternalFormat = (PixelInternalFormat)All.AtcRgbaExplicitAlphaAmd;
glFormat = (PixelFormat)All.CompressedTextureFormats;
break;
case SurfaceFormat.RgbaATCInterpolatedAlpha:
glInternalFormat = (PixelInternalFormat)All.AtcRgbaInter... |
<<<<<<<
Dictionary<long, NetConnection> connectedGamers = new Dictionary<long, NetConnection>();
bool online = false;
private static int port = 3074;
private static IPEndPoint m_masterServer;
private static int masterserverport = 6000;
private static string masterServer = "86.1... |
<<<<<<<
{
AssertNotDisposed();
=======
{
_platform.BeforeInitialize();
>>>>>>>
{
AssertNotDisposed();
_platform.BeforeInitialize(); |
<<<<<<<
// Initialize GameTime
_updateGameTime = new GameTime();
_drawGameTime = new GameTime();
gesture = new GestureDetector(new GestureListener((AndroidGameActivity)this.Context));
=======
gesture = new GestureDetector(new GestureListener((AndroidGameActivity)thi... |
<<<<<<<
#if OPENGL
Threading.BlockOnUIThread(() =>
=======
Threading.Begin();
try
>>>>>>>
Threading.BlockOnUIThread(() =>
<<<<<<<
});
#elif DIRECTX
var d3dDevice = device._d3dDevice;
if (isVertexShader)
... |
<<<<<<<
return texture;
#elif WINDOWS_STOREAPP
=======
Texture2D texture = null;
Threading.BlockOnUIThread(() =>
{
texture = new Texture2D(graphicsDevice, width, height, false, SurfaceFormat.Color);
texture.SetData<i... |
<<<<<<<
_platform = GamePlatform.Create(this);
_platform.Activated += Platform_Activated;
_platform.Deactivated += Platform_Deactivated;
_services.AddService(typeof(GamePlatform), _platform);
// Set the window title.
// TODO: Get the title from t... |
<<<<<<<
this._folderDeleteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this._folderRebuildMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this._buildLaunchDebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this._rebuildLaunchDe... |
<<<<<<<
_viewport.Width = DisplayMode.Width;
_viewport.Height = DisplayMode.Height;
if (ResourcesLost)
{
ContentManager.ReloadAllContent();
ResourcesLost = false;
=======
if (ResourcesLost)
{
Cont... |
<<<<<<<
internal uint glFramebuffer;
#elif PSM
internal FrameBuffer _frameBuffer;
=======
>>>>>>>
#elif PSM
internal FrameBuffer _frameBuffer; |
<<<<<<<
public void Begin ()
=======
/// <summary>
///Initialize shaders and program on OpenGLES2.0
/// </summary>
private void InitGL20()
{
string vertexShaderSrc = @" uniform mat4 uMVPMatrix;
attribute vec4 aPosition;
attribute vec2 aTexCoord;
attribute vec4... |
<<<<<<<
#elif WINDOWS_STOREAPP
=======
#endif
#if WINDOWS_MEDIA_ENGINE || WINDOWS_MEDIA_SESSION
>>>>>>>
#endif
#if WINDOWS_MEDIA_ENGINE || WINDOWS_MEDIA_SESSION
<<<<<<<
#if WINDOWS_STOREAPP
private static MediaEngine _mediaEngineEx;
=======
#if WINDOWS_MEDIA_ENGINE
private static readonly MediaE... |
<<<<<<<
=======
void Flush()
{
_batcher.DrawBatch (_sortMode, graphicsDevice.SamplerStates[0]);
}
void CheckValid(Texture2D texture)
{
if (texture == null)
throw new ArgumentNullException("texture");
if (!beginCalled)
throw new I... |
<<<<<<<
=======
#if DEBUG && !WINDOWS_PHONE
var licenseInformation = CurrentAppSimulator.LicenseInformation;
#else
>>>>>>>
<<<<<<<
MessageBoxIcon icon);
public static Nullable<int> ShowMessageBox(string title,
string text,
IEnumerable<string>... |
<<<<<<<
#elif GLES
=======
using PssVertexBuffer = Sce.Pss.Core.Graphics.VertexBuffer;
#elif WINRT
//Nothing
#else
>>>>>>>
#elif GLES
<<<<<<<
#if DIRECTX
throw new NotImplementedException();
=======
#if WINRT
#elif PSS
throw new NotImplementedException();
>>>>>>>
#if DIRECTX
t... |
<<<<<<<
#if PSS
#warning We are only setting one hardcoded parameter here. Need to do this properly by iterating _effect.Parameters (Happens in DXShader)
float[] data = (float[])_effect.Parameters["WorldViewProj"].Data;
Sce.Pss.Core.Matrix4 matrix4 = PSSHelper.ToPssMatrix4(data);
_ef... |
<<<<<<<
void DoAction(string action, string key);
=======
bool CanRemove(string[] keys);
>>>>>>>
bool CanRemove(string[] keys);
void DoAction(string action, string key); |
<<<<<<<
using System.Threading;
=======
using System.Runtime.InteropServices;
using System.Threading;
>>>>>>>
using System.Threading;
using System.Threading; |
<<<<<<<
public void TestConcat()
{
Stream testProgramStream = File.OpenRead(@"CorrectSampleLuaFiles\concat.lua");
List<Token> tokenList = Lexer.Tokenize(testProgramStream);
int tokenIndex = 0;
Assert.Equal(TokenType.StringConcatOperator, tokenList[tokenInd... |
<<<<<<<
using LanguageService.Shared;
using Microsoft.VisualStudio.LanguageServices.Lua.Shared;
=======
using Microsoft.VisualStudio.LuaLanguageService.Shared;
>>>>>>>
using LanguageService.Shared;
using Microsoft.VisualStudio.LanguageServices.Lua.Shared;
<<<<<<<
=======
using Validation;
>>>>>>>
<<<<<<<
namesp... |
<<<<<<<
private Tagger tagger;
public Tagger Tagger
{
get
{
if (this.tagger == null)
{
this.tagger = new Tagger(this.standardClassifications.Value, this);
}
return this.tagger;
... |
<<<<<<<
* Copyright (c) 2008-2017 Dolittle. All rights reserved.
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/
using System;
=======
* Copyright (c) 2008-2017 Dolittle. All ... |
<<<<<<<
public object Cover { get; set; }
public string Artist { get; set; }
public string Title { get; set; }
=======
>>>>>>>
public object Cover { get; set; }
public string Artist { get; set; }
public string Title { get; set; } |
<<<<<<<
/// <summary>
/// Setting or getting whether we are in the repeat state
/// </summary>
RepeatMode Repeat { get; set; }
=======
RepeatMode RepeatMode { get; set; }
>>>>>>>
/// <summary>
/// Setting or getting whether we are in the repeat state
... |
<<<<<<<
options = options ?? new ElasticsearchSinkOptions(new [] { new Uri("http://localhost:9200") });
var sink = new ElasticsearchSink(options);
=======
options = options ?? new ElasticsearchSinkOptions(new [] { new Uri("http://locahost:9200") });
var sink = string.I... |
<<<<<<<
using System.Linq;
using System.Threading;
=======
>>>>>>>
using System.Linq;
<<<<<<<
=======
private const int MaxNuGetExeFileSize = 10 * 1024 * 1024;
private static readonly object fileLock = new object();
>>>>>>>
private const int MaxNuGetExeFileSize = 10 * 1024 * 1024; |
<<<<<<<
public const string OwinRoute = "OwinRoute";
public const string Pages = "Pages";
=======
public const string ExternalAuthentication = "ExternalAuthentication";
public const string ExternalAuthenticationCallback = "ExternalAuthenticationCallback";
public const string Re... |
<<<<<<<
public DateTime? LastEdited { get; set; }
=======
// License Report Information
public string LicenseUrl { get; set; }
public string LicenseNames { get; set; }
public string LicenseReportUrl { get; set; }
>>>>>>>
public DateTime? LastEdited { get; set; }
... |
<<<<<<<
public Mock<ICuratedFeedByNameQuery> StubCuratedFeedByNameQry { get; private set; }
public Mock<ICuratedFeedService> StubCuratedFeedService { get; private set; }
public Mock<ISearchService> StubSearchService { get; private set; }
=======
public Mock<ICuratedFeed... |
<<<<<<<
await Task.WhenAll(source, inner);
if (!default(EqDefault<K>).Equals(outerKeyMap(source.Result), innerKeyMap(inner.Result)))
=======
await Task.WhenAll(source, inner).ConfigureAwait(false);
if (!EqualityComparer<K>.Default.Equals(outerKeyMap(source.Result), inne... |
<<<<<<<
addHeader(file);
=======
file.WriteLine("// clang-format off");
addGPLheader(file);
>>>>>>>
file.WriteLine("// clang-format off");
addHeader(file);
<<<<<<<
addHeader(file);
=======
file.WriteLine("// clang-format off");
... |
<<<<<<<
public DeviceInfo()
=======
//[EdsExport] @fixme place this in EDS as comment
public string LSS_Type = "";
public DeviceInfo(Dictionary<string, string> section)
>>>>>>>
//[EdsExport] @fixme place this in EDS as comment
public string LSS_Type = "";
pub... |
<<<<<<<
//[EdsExport] @fixme place this in EDS as comment
public string LSS_Type = "Server";
=======
[EdsExport(true)] //comment only, not supported by eds
public string LSS_Type = "";
>>>>>>>
[EdsExport(true)] //comment only, not supported by eds
public string LSS_Typ... |
<<<<<<<
this.textBox_compactPDO = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
=======
this.comboBox_lss = new System.Windows.Forms.ComboBox();
>>>>>>>
this.textBox_compactPDO = new System.Windows.Forms.TextBox();
this... |
<<<<<<<
var outputKind = SpanKindInternal.Markup;
=======
>>>>>>>
<<<<<<<
outputKind = SpanKindInternal.Code;
=======
>>>>>>>
<<<<<<<
outputKind = SpanKindInternal.Code;
=======
>>>>>>>
<<<<<<<
outputKind = SpanKindIn... |
<<<<<<<
outputValues[0] = (long)(outputValues[0] * _linearSensitivityScaleFactor);
outputValues[1] = (long)(outputValues[1] * _linearSensitivityScaleFactor);
=======
outputValues[0] = (short) (outputValues[0] * _linearSenstitivityScaleFactor);
... |
<<<<<<<
private FileItem(FileContainer fileContainer, string sourceFilePath, TypeFile typeFile)
=======
public static FileItem NewSubtitleFileItem(FileContainer fileContainer)
{
FileItem fileItem = new FileItem(fileContainer, null, TypeFile.SubtitleText);
fileItem.IpfsP... |
<<<<<<<
var browserComposer = new Browser(
with =>
{
with.Module<TestModule>();
with.RootPathProvider<StaticPathProvider>();
with.ViewEngines(typeof(SuperSimpleViewEngineWrapper), typeof(Razor... |
<<<<<<<
=======
TitleViewManager _titleViewManager;
>>>>>>>
TitleViewManager _titleViewManager;
<<<<<<<
void UpdateTitleViewPresenter()
{
if (TitleView == null)
{
TitleViewVisibility = Visibility.Collapsed;
if (_titleViewPresenter != null)
_titleViewPresenter.Loaded -= O... |
<<<<<<<
void IImageElement.OnImageSourceSourceChanged(object sender, EventArgs e) =>
ImageElement.ImageSourceSourceChanged(this, e);
=======
bool IImageController.GetLoadAsAnimation() => false;
bool IImageElement.IsLoading => false;
bool IImageElement.IsAnimationPlaying => false;
void IImageElement.On... |
<<<<<<<
View _flyoutHeader;
int _actionBarHeight;
=======
AppBarLayout _appBar;
RecyclerView _recycler;
ShellFlyoutRecyclerAdapter _adapter;
View _flyoutHeader;
int _actionBarHeight;
>>>>>>>
AppBarLayout _appBar;
RecyclerView _recycler;
ShellFlyoutRecyclerAdapter _adapter;
View _flyoutHeader;
... |
<<<<<<<
_child.Element?.DisposeModalAndChildRenderers();
_child.NativeView.RemoveFromSuperview();
_child.Dispose();
_child = null;
=======
if (_child != null)
{
if (_child.Element.Platform is Platform platform)
platform.DisposeModelAndChildrenRenderers(_child.Element);
_c... |
<<<<<<<
using Xamarin.Forms.Platform.Android;
using AMenuItemCompat = global::Android.Support.V4.View.MenuItemCompat;
using AView = Android.Views.View;
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
=======
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
using NestedScro... |
<<<<<<<
var adapter = new ShellFlyoutRecyclerAdapter(shellContext, OnElementSelected);
recycler.SetClipToPadding(false);
recycler.SetLayoutManager(_layoutManager = new ScrollLayoutManager(context, (int)Orientation.Vertical, false));
recycler.SetAdapter(adapter);
=======
_adapter = new ShellFlyoutRecycl... |
<<<<<<<
UnsubscribeSwipeItemEvents();
_swipeItems.Clear();
=======
_swipeThreshold = 0;
_swipeOffset = 0;
>>>>>>>
UnsubscribeSwipeItemEvents();
_swipeItems.Clear();
_swipeThreshold = 0;
_swipeOffset = 0; |
<<<<<<<
public const string Shell = "Shell";
public const string TabbedPage = "TabbedPage";
=======
public const string Shell = "Shell";
public const string CustomRenderers = "CustomRenderers";
>>>>>>>
public const string Shell = "Shell";
public const string TabbedPage = "TabbedPage";
public const stri... |
<<<<<<<
using Xamarin.Forms.Platform.Android.FastRenderers;
=======
using AColor = Android.Graphics.Color;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
>>>>>>>
using AColor = Android.Graphics.Color;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Xamarin.Forms.Platform.Android.FastRend... |
<<<<<<<
var iconColor = NavigationPage.GetIconColor(Current);
if (iconColor.IsDefault)
iconColor = barTextColor;
NavigationBar.TintColor = iconColor == Color.Default || statusBarColorMode == StatusBarTextColorMode.DoNotAdjust
=======
NavigationBar.TintColor = barTextColor == Color.Default || NavPage.... |
<<<<<<<
=======
using Microsoft.AspNetCore.Routing.Patterns;
>>>>>>>
using Microsoft.AspNetCore.Routing.Patterns;
<<<<<<<
var response = httpContext.Response;
response.StatusCode = 200;
response.ContentType = "text/plain";
... |
<<<<<<<
internal const int requestCodeFilePicker = 11001;
internal const int requestCodeMediaPicker = 11002;
internal const int requestCodeMediaCapture = 11003;
internal const int requestCodeStart = 12000;
static int requestCode = requestCodeStart;
internal static int ... |
<<<<<<<
AButton view = View;
=======
if (View?.LayoutParameters == null && _hasLayoutOccurred)
return false;
AppCompatButton view = View;
>>>>>>>
if (View?.LayoutParameters == null && _hasLayoutOccurred)
return false;
AButton view = View; |
<<<<<<<
UpdateItemsUpdatingScrollMode();
=======
UpdateFlowDirection();
>>>>>>>
UpdateItemsUpdatingScrollMode();
UpdateFlowDirection(); |
<<<<<<<
=======
using AButton = Android.Widget.Button;
using Android.Text.Method;
>>>>>>>
using Android.Text.Method;
<<<<<<<
_renderer.View.SetAllCaps(textTransform == TextTransform.Default);
=======
// Use defaults only when user hasn't specified alternative TextTransform settings
if (textTransform ==... |
<<<<<<<
GalleryBuilder.NavButton("Footer Only (String)", () => new FooterOnlyString(), Navigation),
=======
GalleryBuilder.NavButton("Header/Footer (Grid Horizontal)", () => new HeaderFooterGridHorizontal(), Navigation),
>>>>>>>
GalleryBuilder.NavButton("Footer Only (String)", () => new FooterOnlyS... |
<<<<<<<
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
=======
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery;
>>>>>>>
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery; |
<<<<<<<
using Android.Support.V4.Content;
using Android.Views;
=======
using Android.Provider;
>>>>>>>
using Android.Provider;
using Android.Views; |
<<<<<<<
static bool? s_isiOS13OrNewer;
=======
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
>>>>>>>
static bool? s_isiOS13OrNewer;
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
<<<<<<<
internal static bool IsiOS13OrNewer
{
get
{
if (!s_isiOS13OrNewer.H... |
<<<<<<<
CancellationToken cancellationToken,
bool immediate = true,
=======
>>>>>>>
CancellationToken cancellationToken,
<<<<<<<
default(CancellationToken),
immediate: true,
=======
>>>>>>>
default(Cancell... |
<<<<<<<
public override void AppRequest(string message, string[] to, string extraData, string dialogTitle, AppRequestSuccess success, AppRequestFailed fail) {
FB.AppRequest(message,
to,
"", null, null,
extraData,
dialogTitle,
(FBR... |
<<<<<<<
public class EventVenues : AutoReversingMigration {
public override void Up() {
Create.Table("EventVenues")
.WithColumn("Id").AsInt32().NotNullable().PrimaryKey().Identity()
.WithColumn("Address").AsString().NotNullable().WithDefaultValue(string.Empty)
.WithColumn("JapaneseName").AsString(255)... |
<<<<<<<
using VocaDb.Model.Domain.Comments;
=======
using VocaDb.Model.Domain.ExtLinks;
>>>>>>>
using VocaDb.Model.Domain.Comments;
using VocaDb.Model.Domain.ExtLinks; |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
=======
>>>>>>>
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
usin... |
<<<<<<<
using MoneyFox.Domain;
=======
using MoneyFox.Presentation.Utilities;
>>>>>>>
using MoneyFox.Domain;
using MoneyFox.Presentation.Utilities; |
<<<<<<<
unitOfWork.CategoryRepository.Selected = new Category();
=======
>>>>>>>
<<<<<<<
Assert.IsNull(unitOfWork.CategoryRepository.Selected);
=======
>>>>>>> |
<<<<<<<
[Activity(Label = "MoneyFox", Theme = "@style/MainTheme", ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation,
Exported = true, Name = "com.applysolutions.moneyfox.MainActivity")]
public class MainActivity : MvxFormsAppCompatActivity
{
/// <summary>
/// Constant for... |
<<<<<<<
var track = false;
Module module = null;
=======
>>>>>>>
Module module = null;
<<<<<<<
if (_filter.UseAssembly(assemblyName))
{
if (builder.CanInstrument)
{
module = builder.BuildModuleModel();
... |
<<<<<<<
=======
var accounts = AccountStore.Create(Application.Context).FindAccountsForService(ONEDRIVE_KEY).ToList();
if (accounts.Any())
{
authenticationResponseValues = accounts.FirstOrDefault()?.Properties;
//tcs.SetResult(true);
... |
<<<<<<<
using MediatR;
using MoneyFox.Application.Common.Interfaces;
using MoneyFox.Domain;
using MoneyFox.Domain.Entities;
using System;
=======
using System;
using System.Collections.Generic;
>>>>>>>
using MediatR;
using MoneyFox.Application.Common.Interfaces;
using MoneyFox.Domain;
using MoneyFox.Domain.Entiti... |
<<<<<<<
=======
using MoneyManager.Windows;
>>>>>>>
<<<<<<<
using MoneyFox.Windows.Shortcut;
=======
using PluginLoader = MvvmCross.Plugins.Messenger.PluginLoader;
>>>>>>>
using PluginLoader = MvvmCross.Plugins.Messenger.PluginLoader; |
<<<<<<<
using System.Collections.ObjectModel;
using System.Diagnostics;
=======
>>>>>>>
using System.Collections.ObjectModel;
<<<<<<<
/// <summary>
/// ICommandLine
/// </summary>
=======
private static readonly object Protection = new object();
/// <summary>
/// Provides ... |
<<<<<<<
public virtual bool IsFolderLocked(string path)
{
var files = GetFileInfos(path, "*.*", SearchOption.AllDirectories);
foreach(var fileInfo in files)
{
if (IsFileLocked(fileInfo))
return true;
}
ret... |
<<<<<<<
using Ninject;
=======
using NzbDrone.Model;
>>>>>>>
using Ninject;
using NzbDrone.Model;
<<<<<<<
=======
public virtual AuthenticationType AuthenticationType
{
get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); }
set { SetValue("AuthenticationT... |
<<<<<<<
.WhereAll().Has(s => s.SeriesId = 5)
.Build())
.With(c => c.Quality = new Quality(QualityTypes.DVD, false))
.Build();
=======
... |
<<<<<<<
using NzbDrone.Common.Processes;
=======
using NzbDrone.Core.Configuration;
>>>>>>>
using NzbDrone.Common.Processes;
using NzbDrone.Core.Configuration; |
<<<<<<<
[Test]
public void SetPostDownloadStatus_Invalid_EpisodeId()
{
var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer();
mocker.SetConstant(db);
var postDownloadStatus = PostDownloadStatusType.Failed;
var fakeSeries ... |
<<<<<<<
parseResult.AirDate, parseResult.EpisodeTitle, parseResult.Quality.Quality);
=======
parseResult.AirDate, parseResult.Episodes.First().Title, parseResult.Quality.QualityType);
>>>>>>>
parseResult.Ai... |
<<<<<<<
var progressNotification = new ProgressNotification("Settings");
_notificationProvider.Register(progressNotification);
=======
>>>>>>>
_notificationProvider.Register(progressNotification);
<<<<<<<
var progressNotification = new ProgressNotification("Settings"... |
<<<<<<<
case Constants.LOGON:
LoadLogonTab();
=======
case Constants.Logon:
>>>>>>>
case Constants.Logon:
LoadLogonTab(); |
<<<<<<<
//new client, generate nonce and add to unauth queue
if (ConnectedClients.Count >= MaxPlayers)
=======
inc.SenderConnection.Deny("Connection error - already joined");
return;
}
int nonce = CryptoRandom.Instance.Next();
... |
<<<<<<<
if (needsAir) UpdateOxygen(deltaTime);
if (DoesBleed)
{
Health -= bleeding * deltaTime;
Bleeding -= BleedingDecreaseSpeed * deltaTime;
}
if (health <= minHealth) Kill(CauseOfDeath.Bloodloss);
if (!IsDead) ... |
<<<<<<<
=======
Assert.IsType<TestEvent>(actual);
Assert.Equal(expected.Id, actual.Id);
Assert.Equal(expected.DateTime, actual.DateTime);
>>>>>>>
Assert.IsType<TestEvent>(actual); |
<<<<<<<
PlayerSettings.iOS.sdkVersion = iOSSdkVersion.DeviceSDK;
BuildPuppetScene(BuildTarget.iOS, "PuppetBuilds/iOSMonoBuild");
=======
BuildPuppetScene(BuildTarget.iOS, "iOSMonoBuild");
>>>>>>>
PlayerSettings.iOS.sdkVersion = iOSSdkVersion.DeviceSDK;
BuildPuppetScene(BuildTa... |
<<<<<<<
inGameHUD.Update((float)Timing.Step);
=======
>>>>>>>
<<<<<<<
//AssignJobs(connectedClients);
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
msg.Write(AllowRespawn);
=======
msg.Write(AllowRespawn);
m... |
<<<<<<<
if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime);
=======
if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime);
c.ReliableChannel.Update(deltaTime);
//slowly reset spam timers
c.ChatSp... |
<<<<<<<
=======
if (!loading) Item.NewComponentEvent(this, true, true);
UpdateSections();
>>>>>>>
UpdateSections();
<<<<<<<
=======
UpdateSections();
item.NewComponentEvent(this, true, true);
>>>>>>>
UpdateSecti... |
<<<<<<<
//no need to write steering info if autopilot is controlling
msg.Write(targetVelocity.X);
msg.Write(targetVelocity.Y);
}
else
{
msg.Write(posToMaintain != null);
=======
message.Write(posToMaint... |
<<<<<<<
=======
string selectedPassword = "";
if (hasPassword)
{
var msgBox = new GUIMessageBox(msg, "", new string[] { "OK", "Cancel" });
var passwordBox = new GUITextBox(new Rectangle(0,40,150,25), Alignment.TopLeft, "", msgBox.children[0]);
... |
<<<<<<<
DebugConsole.ThrowError("Failed to start a new round", e);
//try again in >5 seconds
if (autoRestart) AutoRestartTimer = Math.Max(AutoRestartInterval, 5.0f);
GameMain.NetLobbyScreen.StartButton.Enabled = true;
GameMain.NetLobbyScre... |
<<<<<<<
Vector2 namePos = new Vector2(pos.X, pos.Y - 110.0f - (5.0f / cam.Zoom)) - GUI.Font.MeasureString(Info.Name) * 0.5f / cam.Zoom;
Vector2 screenSize = new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
Vector2 viewportSize = new Vector2(cam.WorldView.Widt... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.