conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
/// An offset of where the object is rendered.
/// </summary>
protected Point renderOffset;
/// <summary>
/// Renderer used to draw the animation of the game object to the screen.
/// </summary>
public Consoles.ITextSurfaceRenderer Renderer { get { return... |
<<<<<<<
{
object remoteValue = DoRemote(token, key);
if (remoteValue != null || m_doRemoteOnly)
return (List<string>)remoteValue;
Dictionary<string, object> where = new Dictionary<string, object>(2);
where["Token"] = token.MySqlEscape(... |
<<<<<<<
var lineNumberMargin = new LineNumberMargin { Margin = new Thickness(0, 0, 10, 0) };
TextBlock.SetForeground(lineNumberMargin, Brushes.Gray);
_textEditor.TextArea.LeftMargins.Add(lineNumberMargin);
_textEditor.TextArea.IndentationStrategy = new Indentation.CSharp.... |
<<<<<<<
using CoiniumServ.Payments;
using CoiniumServ.Pools;
=======
using CoiniumServ.Pools.Config;
>>>>>>>
using CoiniumServ.Pools; |
<<<<<<<
private long size;
private string fileDataName;
=======
private long size, chunk;
>>>>>>>
private long size, chunk;
private string fileDataName; |
<<<<<<<
public bool IsEip158IgnoredAccount(Address address) => false;
=======
public bool IsEip2028Enabled => false;
public bool IsEip152Enabled => false;
public bool IsEip1108Enabled => false;
public bool IsEip1884Enabled => false;
public bool IsEip2200Enabled => false... |
<<<<<<<
=======
using Nethermind.Config;
using Nethermind.Monitoring.Config;
>>>>>>>
using Nethermind.Monitoring.Config; |
<<<<<<<
using System;
namespace Nevermind.Core
=======
/*
* Copyright (c) 2018 Demerzel Solutions Limited
* This file is part of the Nethermind library.
*
* The Nethermind library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published... |
<<<<<<<
// Contract.Requires(!this.IsEmpty); => Is true, but impossible to proof with acceptable effort.
Contract.Requires(value >= 0.0 || Double.IsNaN(value));
=======
Contract.Requires(!this.IsEmpty);
Contract.Requires((value >= 0.0) || Double.IsNaN(value) || Double.IsPositiveInfinit... |
<<<<<<<
Func<Task<bool>> _runIf = _alwaysRun;
=======
Func<T, T, bool> _comparison = DefaultComparison;
Func<Task> _beforeRun;
>>>>>>>
Func<T, T, bool> _comparison = DefaultComparison;
Func<Task> _beforeRun;
Func<Task<bool>> _runIf = _alwaysRun;
<<<<<<<
public... |
<<<<<<<
catch (Exception ex)
{
Exception = ex;
}
stopwatch.Stop();
=======
var stop = Stopwatch.GetTimestamp();
>>>>>>>
catch (Exception ex)
{
Exception = ex;
}
var stop = Stopw... |
<<<<<<<
/// Defines the check to run to determine if the experiment should run.
/// </summary>
/// <param name="check">The delegate to evaluate.</param>
void RunIf(Func<bool> check);
/// <summary>
=======
/// Define any expensive setup here before the experiment is run... |
<<<<<<<
Assert.True(candidateRan);
Assert.True(controlRan);
Assert.False(TestHelper.Observation.First(m => m.ExperimentName == "failure").Matched);
=======
await mock.Received().Control();
await mock.Received().Candidate();
Assert.False(TestHelpe... |
<<<<<<<
readonly Dictionary<string, Func<Task<T>>> _behaviors;
=======
>>>>>>>
<<<<<<<
public ExperimentInstance(string name, Func<Task<T>> control, Func<Task<T>> candidate, Func<Task<bool>> runIf)
=======
internal ExperimentInstance(string name, NamedBehavior control, NamedBeha... |
<<<<<<<
Result<int> observedResult = TestHelper.Results<int>(experimentName).First();
=======
var observedResult = TestHelper.Results<int>().First(m => m.ExperimentName == experimentName);
>>>>>>>
var observedResult = TestHelper.Results<int>(experimentName).First();
<<<<<<<
... |
<<<<<<<
if (m_VolumetricLightingPreset != VolumetricLightingPreset.Off)
{
// TODO: enable keyword VOLUMETRIC_LIGHTING_ENABLED.
SetVolumetricLightingData(hdCamera, cmd);
}
else
{
/... |
<<<<<<<
=======
BoogieStmtList procBody = TranslateStatement(node.Body);
>>>>>>>
<<<<<<<
List<BoogieVariable> inParams = TransUtils.GetInParams();
=======
currentBoogieProc = procName;
if (!boogieToLocalVarsMap.ContainsKey(currentBoogieProc))
{
... |
<<<<<<<
if (args.Any(x => x.StartsWith("/inlineDepth:")))
{
var depth = args.Where(x => x.StartsWith("/inlineDepth:")).First();
translatorFlags.InlineDepthForBoogie = int.Parse(depth.Substring("/inlineDepth:".Length));
}
=======
if (args... |
<<<<<<<
else if (unaryOperation.Operator.Equals("--"))
{
BoogieExpr rhs = new BoogieBinaryOperation(BoogieBinaryOperation.Opcode.SUB, lhs, new BoogieLiteralExpr(1));
BoogieAssignCmd assignCmd = new BoogieAssignCmd(lhs, rhs);
cur... |
<<<<<<<
[assembly: InternalsVisibleTo("DiscUtils.Swap, PublicKey=002400000480000094000000060200000024000052534131000400000100010047ebec172a9831bb20fede77e17d784026ea7030d7055f2ae09576c71cebe77ebfab436d80580a4fcbba7242ff61bd52b686f5fe9d41fe7cd3e6c05b8a876eccf35b8ad7c5e3a6704295d7210b138d7280a6f72688419a65dd7a8612d66869f... |
<<<<<<<
LogSectorSize = EndianUtilities.ToUInt16BigEndian(buffer, offset + 0xC2);
LogUnitSize = EndianUtilities.ToUInt32BigEndian(buffer, offset + 0xC4);
Features2 = EndianUtilities.ToUInt32BigEndian(buffer, offset + 0xC8);
BadFeatures2 = EndianUtilities.ToUInt32BigEndian... |
<<<<<<<
InodeBtreeInfo = new AllocationGroupInodeBtreeInfo();
data.Position = offset + superblock.SectorSize*2;
var agiData = StreamUtilities.ReadFully(data, InodeBtreeInfo.Size);
=======
InodeBtreeInfo = new AllocationGroupInodeBtreeInfo(superblock);
data.P... |
<<<<<<<
context.RawStream.Position = GetOffset(context);
return StreamUtilities.ReadFully(context.RawStream, (int) count);
=======
context.RawStream.Position = GetOffset(context) + offset;
return Utilities.ReadFully(context.RawStream, (int) count);
>>>>>>>
... |
<<<<<<<
/// </summary>
internal static Bindable<bool> DisplayUnbeatableScoresDuringGameplay { get; private set; }
/// <summary>
=======
/// The selected judgement window preset
/// </summary>
internal static Bindable<string> JudgementWindows { get; private set; }
... |
<<<<<<<
ListeningParty = null;
FriendsList = new List<int>();
=======
SpectatorClients = new Dictionary<int, SpectatorClient>();
Spectators = new Dictionary<int, User>();
>>>>>>>
ListeningParty = null;
FriendsList = new L... |
<<<<<<<
using Wobble.Screens;
=======
using Quaver.Online;
using Wobble.Screens;
>>>>>>>
using Quaver.Online;
using Wobble.Screens; |
<<<<<<<
=======
using Quaver.Logging;
using Quaver.Online;
using Quaver.Online.Chat;
>>>>>>>
using Quaver.Online;
using Quaver.Online.Chat;
<<<<<<<
LogManager.Draw(gameTime);
=======
>>>>>>>
LogManager.Draw(gameTime);
<<<<<<<
ConfigManager.Initialize();
... |
<<<<<<<
public static Texture2D CloseChannelButton { get; set; }
public static Texture2D SendMessageButton { get; set; }
=======
public static Texture2D ThumbnailSinglePlayer { get; set; }
public static Texture2D ThumbnailCompetitive { get; set; }
public static Texture2D Thumbn... |
<<<<<<<
Gavel = AssetLoader.LoadTexture2D(QuaverResources.fa_legal_hammer);
Wrench = AssetLoader.LoadTexture2D(QuaverResources.fa_open_wrench_tool_silhouette);
=======
StepBackward = AssetLoader.LoadTexture2D(QuaverResources.fa_step_backward);
StepForward = AssetLoader.... |
<<<<<<<
/// Whether or not to play hitsounds in the editor.
/// </summary>
internal static Bindable<bool> EditorEnableHitsounds { get; private set; }
/// <summary>
/// The type of beat snap colors that'll be displayed in the editor.
/// </summary>
interna... |
<<<<<<<
/// </summary>
internal static Bindable<bool> ShowSpectators { get; private set; }
/// <summary>
=======
/// The selected judgement window preset
/// </summary>
internal static Bindable<string> JudgementWindows { get; private set; }
/// <summary>
... |
<<<<<<<
using Quaver.Shared.Online;
=======
using Quaver.Shared.Scheduling;
>>>>>>>
using Quaver.Shared.Online;
using Quaver.Shared.Scheduling; |
<<<<<<<
using Quaver.Shared.Audio;
=======
using Quaver.Shared.Database.Judgements;
>>>>>>>
using Quaver.Shared.Audio;
using Quaver.Shared.Database.Judgements;
<<<<<<<
VirtualPlayer = new VirtualReplayPlayer(Replay, Screen.Map, Screen.SpectatorClient != null);
=======
VirtualPlayer = new V... |
<<<<<<<
internal static Texture2D Pencil { get; set; }
internal static Texture2D Play { get; set; }
internal static Texture2D Pause { get; set; }
internal static Texture2D Stop { get; set; }
internal static Texture2D File { get; set; }
internal static Texture2D Folder { g... |
<<<<<<<
/// </summary>
internal static Bindable<bool> DisplayJudgementCounter { get; private set; }
/// <summary>
=======
/// If true, the user will skip the results screen after quitting the game.
/// </summary>
internal static Bindable<bool> SkipResultsScreenAfte... |
<<<<<<<
var textureHeight = SliceSize / 2;
=======
>>>>>>>
var textureHeight = SliceSize / 2;
<<<<<<<
}
public override void Update(GameTime gameTime)
{
base.Update(gameTime);
=======
>>>>>>> |
<<<<<<<
/// </summary>
internal static Bindable<bool> DisplayUnbeatableScoresDuringGameplay { get; private set; }
/// <summary>
=======
/// </summary>
internal static Bindable<bool> ShowSpectators { get; private set; }
/// <summary>
>>>>>>>
/// </summary>
... |
<<<<<<<
internal List<List<Texture2D>> NoteHitObjects { get; set; } = new List<List<Texture2D>>();
internal Texture2D[] NoteHoldBodies { get; set; } = new Texture2D[4];
internal Texture2D[] NoteHoldEnds { get; set; } = new Texture2D[4];
internal Texture2D[] NoteReceptors { get; set; } = ... |
<<<<<<<
new SettingsBool(this, "Display Judgement Counter", ConfigManager.DisplayJudgementCounter),
=======
new SettingsBool(this, "Enable Combo Alerts", ConfigManager.DisplayComboAlerts),
>>>>>>>
new SettingsBool(this, "Display Judgement Counter", ConfigMa... |
<<<<<<<
using Quaver.Graphics.Buttons.Selection;
using Quaver.Graphics.Colors;
=======
using Quaver.Graphics.Buttons.Dropdowns;
using Quaver.Graphics.Buttons.Sliders;
>>>>>>>
using Quaver.Graphics.Buttons.Selection; |
<<<<<<<
/// Argument Processor for the "/Port" command line argument.
=======
/// Argument Executor for the "--Port|/Port" command line argument.
>>>>>>>
/// Argument Processor for the "--Port|/Port" command line argument. |
<<<<<<<
if (classServices.Length != 1)
=======
if (classServices.Count() != 1)
>>>>>>>
if (classServices.Count() != 1)
<<<<<<<
var classService = classServices[0];
=======
var classService = classServices.Single();
>>>>>>>
var classService = classServices.Single();
<<<<<<<
if (registration... |
<<<<<<<
=======
using Castle.Core.Interceptor;
using Castle.DynamicProxy;
>>>>>>>
using Castle.DynamicProxy; |
<<<<<<<
private readonly Func<IKernel, CreationContext, T> creator;
=======
public FactoryMethodActivator(ComponentModel model, IKernel kernel, ComponentInstanceDelegate onCreation, ComponentInstanceDelegate onDestruction)
: base(model, kernel, onCreation, onDestruction)
{
}
>>>>>>>
private readonly Fu... |
<<<<<<<
var gameState = new GameState { Id = id, Name = name, MapId = _mapProvider.GetRandomMap().Id };
=======
var gameState = new GameState { Id = id, Name = name, Started = false, Map = _mapProvider.GetRandomMap() };
>>>>>>>
var gameState = new GameState { Id = id, Name = name,... |
<<<<<<<
using System;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using Samurai.Client.Wp7.Screens;
namespace Samurai.Client.Wp7
{
/// <summary>
/// This is the main type for your game
/// </summary>
public class SamuraiGame : Microsoft.Xn... |
<<<<<<<
QueryFilter filter = new QueryFilter();
filter.andFilters["RegionID"] = regionID;
List<string> telehubposition = GD.Query(new string[11]{
"RegionLocX",
"RegionLocY",
"TelehubLocX",
"TelehubLocY",
... |
<<<<<<<
// ServerInputTextField.text = "signalingserver.centralus.cloudapp.azure.com:3000";
=======
ServerInputTextField.text = "signalingserver.centralus.cloudapp.azure.com:3000";
// Heartbeat interval in ms (-1 will disable)
HeartbeatInputTextField.text = "5000";
>>>>>>>... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
await LoadSettings().ConfigureAwait(false);
=======
await LoadSettings().ConfigureAwait(false);
Conductor.Instance.Signaller.SetHeartbeatMs(Convert.ToInt32(_heartbeat));
>>>>>>>
await LoadSettings().ConfigureAwait(f... |
<<<<<<<
private bool _shouldIgnoreCaseForEnum;
=======
private bool _shouldSerializeCharAsInt;
>>>>>>>
private bool _shouldIgnoreCaseForEnum;
private bool _shouldSerializeCharAsInt;
<<<<<<<
object encryptKey = null,
bool ShouldIgnoreCaseForEnum = false)
=====... |
<<<<<<<
bool ShouldIgnoreCaseForEnum { get; }
=======
bool ShouldSerializeCharAsInt { get; }
>>>>>>>
bool ShouldIgnoreCaseForEnum { get; }
bool ShouldSerializeCharAsInt { get; } |
<<<<<<<
public bool ShouldIgnoreCaseForEnum { get; set; }
=======
public bool ShouldSerializeCharAsInt { get; set; }
>>>>>>>
public bool ShouldIgnoreCaseForEnum { get; set; }
public bool ShouldSerializeCharAsInt { get; set; } |
<<<<<<<
=======
Release = "";
// Get data from the HTTP request
Request = SentryRequest.GetRequest();
// Get the user data from the HTTP context or environment
User = Request != null
? Request.GetUser()
: new ... |
<<<<<<<
#region License
// Copyright (c) 2014 The Sentry Team and individual contributors.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are permitted
// provided that the following conditions are met:
//
// 1. Redistributions of source code must ... |
<<<<<<<
Extra = Convert(extra)
=======
Fingerprint = fingerprint,
Extra = extra
>>>>>>>
Fingerprint = fingerprint,
Extra = Convert(extra)
<<<<<<<
Extra = Convert(extra, exception.Data)
=======
Fingerpri... |
<<<<<<<
=======
if (ActiveDes != null)
{
string txt = String.Format("{0} {1} - {2}", ActiveEntry.DispName,ActiveDes.OriginalName, ActiveDes.NameOnBoard);
G.DrawString(txt, F, Brushes.Pink, 2, 20);
}
>>>>>>>
if (ActiveDes... |
<<<<<<<
_lockFactory = new MultiIndexLockFactory(new AzureDirectoryNativeLockFactory(this), _cacheDirectory.LockFactory);
=======
_lockFactory = isReadOnly
? CacheDirectory.GetLockFactory()
: new MultiIndexLockFactory(new AzureDirectorySimpleLockFac... |
<<<<<<<
using System;
=======
using System;
using System.Collections;
using System.Collections.Generic;
>>>>>>>
using System;
using System.Collections;
using System.Collections.Generic;
<<<<<<<
=======
public IBooleanOperation SelectFieldsInternal(ISet<string> loadedFieldNames)
{
Sele... |
<<<<<<<
private void DoSearch(Query query, IEnumerable<SortField> sortField, int maxResults)
{
var extractTermsSupported = CheckQueryForExtractTerms(query);
=======
private void DoSearch(Query query, IEnumerable<SortField> sortField, int maxResults, int? skip = null, int? take = nu... |
<<<<<<<
=======
// Master avatar cruft
//
string masterAvatarUUID;
if (!creatingNew)
{
masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString());
MasterAvatarFirstName = config.GetString("MasterAvatarFirst... |
<<<<<<<
[UnitOfWork]
public virtual List<NotificationSubscriptionInfo> GetSubscriptions(UserIdentifier user)
{
using (_unitOfWorkManager.Current.SetTenantId(user.TenantId))
{
return _notificationSubscriptionRepository.GetAllList(s => s.UserId == user.User... |
<<<<<<<
=======
[Obsolete]
IClientCacheAttribute DefaultClientCacheAttribute { get; set; }
ResponseCacheAttribute DefaultResponseCacheAttributeForControllers { get; set; }
ResponseCacheAttribute DefaultResponseCacheAttributeForAppServices { get; set; }
>>>>>>>
ResponseCache... |
<<<<<<<
// IPasswordValidator doesn't have a sync version of Validate(...)
//public virtual IdentityResult ChangePassword(TUser user, string newPassword)
//{
// var errors = new List<IdentityError>();
// foreach (var validator in PasswordValidators)
// {
... |
<<<<<<<
return new EntityHistorySnapshot(snapshotPropertiesDictionary, propertyChangesStackTreeDictionary);
}
var changes = await _asyncQueryableExecuter.ToListAsync(
GetEntityChanges<TEntity, TPrimaryKey>(id, snapshotTime)
.Select(x => new { ... |
<<<<<<<
newPosition = currentPosition;
// 1. Are we already at the end of the test string?
if (currentPosition >= allChars.Length - 1)
{
return true;
}
// A) If leading separator then current character needs to be that separator.
... |
<<<<<<<
/// <summary>
/// Checks if two strings are equal. Compares every char to prevent timing attacks.
/// </summary>
/// <param name="a">String to compare.</param>
/// <param name="b">String to compare.</param>
/// <returns>True if both strings are equal</returns>
... |
<<<<<<<
Vector3 PrintOffset;
private ProjectionStack m_projectionStack = ProjectionStack.DefaultStack;
public ProjectionStack ProjectionStack
{
get { return m_projectionStack; }
set { m_projectionStack = value; }
}
=======
Vector3 m_printOffs... |
<<<<<<<
using KeePassLib.Security;
=======
using System.Linq;
>>>>>>>
using KeePassLib.Security;
using System.Linq;
<<<<<<<
ProtectedString decrypted = await Decrypt(encrypted, rResult);
if (decrypted != null)
=======
string decrypted = await Decrypt(encrypted, rRes... |
<<<<<<<
var sr = new CachedSchemaRegistryClient(new Dictionary<string, object> { { "schema.registry.url", config.Server } });
=======
var sr = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = server });
>>>>>>>
var sr = new CachedSchemaRegistryClient(n... |
<<<<<<<
var sr = new CachedSchemaRegistryClient(new Dictionary<string, object> { { "schema.registry.url", config.Server } });
=======
var sr = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = server });
>>>>>>>
var sr = new CachedSchemaRegistryClient(n... |
<<<<<<<
var sr = new CachedSchemaRegistryClient(new Dictionary<string, object> { { "schema.registry.url", config.Server } });
=======
var sr = new CachedSchemaRegistryClient(new SchemaRegistryConfig { SchemaRegistryUrl = server });
>>>>>>>
var sr = new CachedSchemaRegistryClient(n... |
<<<<<<<
=======
using OpenWrap.PackageManagement.Packages;
>>>>>>>
using OpenWrap.PackageManagement.Packages;
<<<<<<<
=======
using OpenWrap.Runtime;
using OpenWrap.Services;
>>>>>>>
using OpenWrap.Runtime;
using OpenWrap.Services;
<<<<<<<
using (_authenticationSupport.WithCredentials(User,Pwd))
... |
<<<<<<<
using ProtonVPN.Common.Threading;
=======
using ProtonVPN.Common.OS.Processes;
>>>>>>>
using ProtonVPN.Common.OS.Processes;
<<<<<<<
=======
using System.Dynamic;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
>>>>>>>
<<<<<<<
private readonly UpdateService _update... |
<<<<<<<
using System.Net;
=======
using System.Security.Cryptography.X509Certificates;
>>>>>>>
using System.Net;
using System.Security.Cryptography.X509Certificates;
<<<<<<<
public static byte[] NewASReq(string userName, string domain, Interop.KERB_ETYPE etype, bool opsec = false)
=======
public s... |
<<<<<<<
var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp);
if (addressFamily != AddressFamily.Unix) SocketConnection.SetRecommendedClientOptions(socket);
=======
var protocolType = addressFamily == AddressFamily.Unix ? ProtocolType.Unspecified : Protocol... |
<<<<<<<
public void DisableProxy()
{
_config.useProxy = false;
SaveConfig(_config);
}
public void EnableProxy(string proxy, int port)
{
_config.useProxy = true;
_config.proxyServer = proxy;
_config.proxyPort = port;
... |
<<<<<<<
private TrainingResult m_taskResult;
private bool m_drawBlackscreen = false;
// The curriculum to use.
[MyBrowsable, Category("Curriculum"), Description("Choose which type of curriculum you want to use.")]
[YAXSerializableField(DefaultValue = CurriculumType.TrainingCurri... |
<<<<<<<
Delta.Count = Neurons * ParentNetwork.BatchSize;
PreviousWeightDelta.Count = Weights.Count; // momentum method
=======
Delta.Count = Neurons;
Delta.Mode = MyTemporalMemoryBlock<float>.ModeType.Cumulate;
Previo... |
<<<<<<<
=======
dataGridView1.ClearSelection();
/*if (m_currentRow >= 0)
{
dataGridView1.Rows[m_currentRow].Selected = true;
}*/
>>>>>>>
dataGridView1.ClearSelection();
/*i... |
<<<<<<<
newSimpleLayer.Tiles[i][j] = staticTilesContainer[tileNumber];
=======
newSimpleLayer.Tiles[i, j] = staticTilesContainer[tileNumber];
>>>>>>>
newSimpleLayer.Tiles[i][j] = staticTilesContainer[tileNumber];
<<<<<<<
... |
<<<<<<<
Owner.NeuronInput,
Owner.Bias,
Owner.DropoutMask,
dropout,
Owner.Neurons,
Owner.ParentNetwork.BatchSize
);
=======
Owner.Weights,
Owner.NeuronInput,
Owner.Bias,
Owner.Dro... |
<<<<<<<
// bbpt single step
BPTTSingleStep.AddRange(newPlan.Where(task => task is IMyDeltaTask).ToList().Reverse<IMyExecutable>());
BPTTSingleStep.AddRange(newPlan.Where(task => task is MyLSTMPartialDerivativesTask).ToList());
BPTTSingleStep.AddRange(newPlan.Where(task =>... |
<<<<<<<
private static FastIoPipe _fastIo;
private bool forceQuit = false;
private bool cmdLaunch = false;
Window window = Application.Current.MainWindow;
=======
private static ControlPipe _pipe;
>>>>>>>
private bool forceQuit = false;
private bool cmdLaunch ... |
<<<<<<<
[Timeout( 60000 )]
=======
[TestFixture]
[Timeout( 30000 )]
>>>>>>>
[TestFixture]
[Timeout( 60000 )] |
<<<<<<<
[Timeout( 60000 )]
=======
[TestFixture]
[Timeout( 30000 )]
>>>>>>>
[TestFixture]
[Timeout( 60000 )] |
<<<<<<<
[Timeout( 60000 )]
=======
[TestFixture]
[Timeout( 30000 )]
>>>>>>>
[TestFixture]
[Timeout( 60000 )] |
<<<<<<<
[Timeout( 60000 )]
=======
[TestFixture]
[Timeout( 30000 )]
>>>>>>>
[TestFixture]
[Timeout( 60000 )] |
<<<<<<<
[Timeout( 60000 )]
=======
[TestFixture]
[Timeout( 30000 )]
>>>>>>>
[TestFixture]
[Timeout( 60000 )] |
<<<<<<<
using System.Threading.Tasks;
=======
using System.Text;
>>>>>>>
using System.Threading.Tasks;
using System.Text;
<<<<<<<
public CancellationTokenSource CancellationTokenSource { get; private set; } = new CancellationTokenSource();
private ManualResetEvent _syncWorkerCompletedEvent = new Ma... |
<<<<<<<
this.cAPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.editInTextCurrentSpeechSynthesisVariablesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.cAPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuIte... |
<<<<<<<
List<VisitedSystemsClass> result;
if (atMost > 0)
{
result = visitedSystems.OrderByDescending(s => s.Time).Take(atMost).ToList();
}
else
{
var oldestData = DateTime.Now.Subtract(maxDataAge);
r... |
<<<<<<<
Compass, // 31
Map, // 32
=======
Compass, // 31
Plot, // 32
>>>>>>>
Compass, // 31
Map, // 32
Plot, // 33... |
<<<<<<<
public void AddOrUpdateLocation(string planet, Location loc)
{
AddOrUpdateLocation(planet, loc.Name, loc.Comment, loc.Latitude, loc.Longitude);
}
public void DeleteLocation( string planet, string placename)
=======
public bool DeleteLocation(string planet, ... |
<<<<<<<
// Also update galactic mapping from EDSM
LogLine("Get galactic mapping from EDSM");
galacticMapping.DownloadFromEDSM();
galacticMapping.ParseData();
=======
_db.GetAllBookmarks();
>>>>>>>
_db.GetAllBookmarks();
... |
<<<<<<<
=======
// Systems in data dumps are now sorted by modify time ascending, so
// the last inserted system should be the most recently modified system.
public static DateTime GetLastSystemModifiedTimeFast()
{
DateTime lasttime = new DateTime(2010, 1, 1, 0, 0, 0);
... |
<<<<<<<
this.cAPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.editInTextCurrentSpeechSynthesisVariablesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
>>>>>>>
this.cAPIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuIte... |
<<<<<<<
=======
this.trilaterationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wantedSystemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bothToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.comboB... |
<<<<<<<
_useDistances = _db.GetSettingBool("EDSMDistances", false);
_EDSMLog = _db.GetSettingBool("EDSMLog", false);
_canSkipSlowUpdates = _db.GetSettingBool("CanSkipSlowUpdates", false);
_orderrowsinverted = _db.GetSettingBool("OrderRowsInverted", false);... |
<<<<<<<
bool IsTravelling(HistoryList hl, out DateTime startTime)
{
bool inTrip = false;
startTime = DateTime.Now;
HistoryEntry lastStartMark = hl.GetLastHistoryEntry(x => x.StartMarker);
if (lastStartMark != null)
{
HistoryEntr... |
<<<<<<<
LogLineHighlight("DLLs failed to load: " + res.Item1);
LogLine("Profile " + EDDProfiles.Instance.Current.Name + " Loaded");
=======
LogLineHighlight("DLLs failed to load: " + res.Item2);
>>>>>>>
LogLineHighlight("DLLs failed to load: " + res.Item2)... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.