conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
Editor.MouseMove += new MouseEventHandler((s, e) => e.Handled = true);
>>>>>>>
Editor.MouseMove += new MouseEventHandler((s, e) => e.Handled = true); |
<<<<<<<
public string channelId;
public FetchCommentsResponse commentsResponse;
=======
public Dictionary<string, List<string>> channelMessageList;
public Dictionary<string, Dictionary<string, Message>> channelMessageDict;
public string channelId;
public string currOlde... |
<<<<<<<
var request =
UnityWebRequest.Get(Config.apiAddress + "/api/p?orderBy=latest&projectType=article&t=projects&page=" + pageNumber);
request.SetRequestHeader("X-Requested-With", "XmlHttpRequest");
=======
var request = HttpManager.GET(Config.apiAddress + "/api/... |
<<<<<<<
public class FetchChannelMentionQuerySuccessAction : BaseAction {
public string channelId;
public List<ChannelMember> members;
}
public class FetchChannelMentionQueryFailureAction : BaseAction {
}
public class ChannelUpdateMentionQueryAction : BaseAction {
publ... |
<<<<<<<
public override Widget build(BuildContext context) {
return new SafeArea(
top: false,
child: new CustomTabBar(
new List<Widget> {
new ArticleScreen(),
new EventsScreen(),
... |
<<<<<<<
public static readonly IconData error_outline = new IconData(0xe001, "Material Icons");
public static readonly IconData mode = new IconData(0xe7f2, "Material Icons");
public static readonly IconData mode_bad = new IconData(0xe7f3, "Material Icons");
public static readonly IconDat... |
<<<<<<<
public ChannelMembersScreenConnector(
string channelId,
Key key = null
) : base(key : key) {
=======
public ChannelMembersScreenConnector(string channelId, Key key = null) : base(key: key) {
>>>>>>>
public ChannelMembersScreenConnector(
stri... |
<<<<<<<
toMiNiProgram(title, description, url, imageBytes, Config.miniId, path, Config.miniProgramType);
=======
toMiNiProgram(title: title, description: description, url: url, imageBytes: imageBytes,
ysId: Config.MINIID, path: path, miniProgramType: Config.miniProg... |
<<<<<<<
public const string ImageBrowser = "/image-browser";
=======
public const string UserDetail = "/user-detail";
public const string UserFollowing = "/user-following";
public const string UserFollower = "/user-follower";
public const string EditPersonalInfo = "/edit-person... |
<<<<<<<
.Then(responseComments => {
state.articleState.articleDetail.comments = responseComments;
=======
.Then((responseComments) => {
// state.articleState.articleDetail.comments = responseComments;
>>>>>>>
... |
<<<<<<<
public class _EventOngoingScreenState : AutomaticKeepAliveClientMixin<EventOngoingScreen> {
=======
public class _EventOngoingScreenState : State<EventOngoingScreen>
{
>>>>>>>
public class _EventOngoingScreenState : State<EventOngoingScreen> {
<<<<<<<
protected override bool wantKeep... |
<<<<<<<
using ConnectApp.components.pull_to_refresh;
using ConnectApp.constants;
=======
>>>>>>>
using ConnectApp.components.pull_to_refresh;
using ConnectApp.constants;
<<<<<<<
ArticleApi.FetchArticles(action.pageNumber)
.Then(articlesResponse => {
... |
<<<<<<<
if (!StoreProvider.store.state.loginState.isLoggedIn)
{
ToLogin();
}
else
... |
<<<<<<<
$"版本号：{Config.versionCode}",
style: CTextStyle.PLargeBody4
=======
$"版本号：{Config.versionNumber}",
style: new TextStyle(
fontSize: 16,
... |
<<<<<<<
readonly InputContentManager _inputContentManager = new InputContentManager();
GlobalKey _smartRefresherKey = GlobalKey<State<SmartRefresher>>.key("SmartRefresher");
=======
readonly GlobalKey _smartRefresherKey = GlobalKey<State<SmartRefresher>>.key("SmartRefresher");
>>>>>>>
... |
<<<<<<<
public string mentionUserId;
public bool mentionAutoFocus;
public Dictionary<string, Dictionary<string, ChannelMember>> mentionSuggestions;
public bool mentionLoading;
=======
public bool socketConnected;
>>>>>>>
public bool socketConnected;
... |
<<<<<<<
using ConnectApp.utils;
=======
using RSG;
>>>>>>>
using ConnectApp.utils;
using RSG;
<<<<<<<
private int _pageNumber = 1;
=======
private int pageNumber = firstPageNumber;
>>>>>>>
private int _pageNumber = firstPageNumber;
<<<<<<<
private string _eventBusId;
=======
... |
<<<<<<<
public static readonly IconData open_in_browser = new IconData(0xe89d, "Material Icons");
=======
public static readonly IconData feedback = new IconData(0xe5ca, "Material Icons");
>>>>>>>
public static readonly IconData open_in_browser = new IconData(0xe89d, "Material Icons");
... |
<<<<<<<
_FetchMessages(Promise<FetchCommentsResponse> promise, string channelId, string currOldestMessageId) {
var url = IApi.apiAddress + "/api/channels/" + channelId + "/messages";
if (currOldestMessageId.isNotEmpty()) url += "?before=" + currOldestMessageId;
=======
... |
<<<<<<<
public class _EventCompletedScreenState : AutomaticKeepAliveClientMixin<EventCompletedScreen> {
=======
public class _EventCompletedScreenState : State<EventCompletedScreen>
{
>>>>>>>
public class _EventCompletedScreenState : State<EventCompletedScreen> {
<<<<<<<
protected override b... |
<<<<<<<
readonly int initialPage;
=======
>>>>>>>
readonly int initialPage;
<<<<<<<
=======
startFetchFollowing = () => dispatcher.dispatch(new StartFetchFollowingAction()),
fetchFollowing = offset =>
dispatcher.dispatch... |
<<<<<<<
Application.targetFrameRate = 60;
FontManager.instance.addFont(Resources.Load<Font>("Material Icons"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Regular"));
FontManager.instance.addFont(Resources.Load<Font>("Roboto-Medium"));
FontManag... |
<<<<<<<
=======
protected override bool wantKeepAlive {
get => true;
}
>>>>>>>
protected override bool wantKeepAlive {
get => true;
}
<<<<<<<
Widget content = new Container();
if (widget.viewModel.notifationLoading) {
=======
... |
<<<<<<<
public ChannelState channelState { get; set; }
=======
public TabBarState tabBarState { get; set; }
>>>>>>>
public ChannelState channelState { get; set; }
public TabBarState tabBarState { get; set; }
<<<<<<<
},
channelState = new ChannelState {... |
<<<<<<<
child: new Text(
data: this.widget.viewModel.socketConnected ? this.widget.viewModel.channel.name : "收取中...",
style: CTextStyle.PXLargeMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis
=======... |
<<<<<<<
fontFamily: "Roboto-Medium",
color: CColors.White
=======
fontFamily: "PingFang-Medium",
color: CColors.H5White
);
public static readonly TextStyle PXLarge = new TextStyle(
height: 1.33f,
fontSize: 18,
... |
<<<<<<<
using System.Collections.Generic;
using ConnectApp.Components;
using ConnectApp.Constants;
using ConnectApp.Main;
using ConnectApp.redux;
using ConnectApp.Utils;
using Unity.UIWidgets.widgets;
namespace ConnectApp.screens {
public class MainScreen : StatelessWidget {
public override Widget build(Bu... |
<<<<<<<
using System;
using System.Collections.Generic;
using Highway.Data.Contexts;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Highway.Data.Tests.InMemory.BugTests
{
[TestClass]
public class InMemBugTests
{
private IDataContext _context;
[TestMethod]
public vo... |
<<<<<<<
using Highway.Data.EntityFramework.Tests.Properties;
=======
>>>>>>>
using Highway.Data.EntityFramework.Tests.Properties;
<<<<<<<
using Rhino.Mocks;
namespace Highway.Data.EntityFramework.Tests.UnitTests
=======
using Rhino.Mocks;
using Highway.Data.EntityFramework.Tests.Properties;
using Highway.Data.Te... |
<<<<<<<
using Kooboo.Sites.KscriptConfig;
=======
using System.ComponentModel;
using KScript.Sites;
using Kooboo.Sites.Scripting;
using Kooboo;
>>>>>>>
using System.ComponentModel;
using KScript.Sites;
using Kooboo.Sites.Scripting;
using Kooboo;
using Kooboo.Sites.KscriptConfig; |
<<<<<<<
public string CommandUIExtension { get; set; }
=======
#region Properties
/// <summary>
/// Gets or sets the name of the custom action.
/// </summary>
>>>>>>>
#region Properties
/// <summary>
/// Gets or sets the name of the custom action.
... |
<<<<<<<
{
ModulePath = Path.Combine(AppContext.BaseDirectory, "modules");
if (!Directory.Exists(ModulePath)) Directory.CreateDirectory(ModulePath);
var modulesHash = GetModulesHash();
Version = Assembly.GetEntryAssembly().GetName().Version;
var build =... |
<<<<<<<
if (e.KeyModifiers == KeyModifiers.Shift) PatternFire(Fire, null);
else PatternPlay(Play, null);
=======
if (e.Modifiers == InputModifiers.Shift) PatternFire(Fire, null);
else if (e.Modifiers == InputModifiers.None) PatternPlay(Play, null);
... |
<<<<<<<
routes.MapGrpcService<GreeterService>();
routes.MapRazorPages();
=======
routes.MapGrpcService<GreeterService>().RequireAuthorization("protectedScope");
>>>>>>>
routes.MapGrpcService<GreeterService>().RequireAuthorization("protectedScope");
... |
<<<<<<<
const string SignOutMessageCookieIdtoRemove = "ids:SignOutMessageCookieIdtoRemove";
public static void QueueRemovalOfSignOutMessageCookie(this IOwinContext context, string id)
{
if (context == null) throw new ArgumentNullException("context");
if (id != null)
... |
<<<<<<<
public bool? http_logout_supported { get; set; }
=======
public string introspection_endpoint { get; set; }
>>>>>>>
public string introspection_endpoint { get; set; }
public bool? http_logout_supported { get; set; } |
<<<<<<<
public static readonly DiagnosticDescriptor RemoveFileWithNoCode = new DiagnosticDescriptor(
id: DiagnosticIdentifiers.RemoveFileWithNoCode,
title: "Remove file with no code.",
messageFormat: "Consider removing file with no code.",
category: Diagnosti... |
<<<<<<<
using System.Collections.ObjectModel;
using System.Globalization;
=======
using System.Diagnostics;
>>>>>>>
using System.Collections.ObjectModel;
using System.Globalization;
<<<<<<<
=======
using OtpNet;
>>>>>>>
using OtpNet;
<<<<<<<
driver.WaitUntilVisible(By.XPath(Elements.Xpath[Reference.... |
<<<<<<<
ContentItem oldVersion = item.Clone(false);
if(item.State == ContentState.Published)
stateChanger.ChangeTo(oldVersion, ContentState.Unpublished);
else
stateChanger.ChangeTo(oldVersion, ContentState.Draft);
oldVersion.Expires = Utility.CurrentTime().AddSeconds(-1);
oldVersion.Updated = Uti... |
<<<<<<<
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, null, new ContainerRepository<TrashContainerItem>(persister, null, new Host(webContext, 1, 1), null), null, null);
=======
TrashHandler th = mocks.StrictMock<TrashHandler>(persister, null, nu... |
<<<<<<<
/// <param name="utcLastModified">The time the resource was modified.</param>
public static void SetValidUntilExpires(this HttpResponse response, DateTime utcLastModified)
=======
/// <param name="lastModified">The time the resource was modified.</param>
public static void SetValidUntilExpires(this Ht... |
<<<<<<<
/// <param name="clearBeforeReindex"></param>
void ReindexDescendants(N2.ContentItem root, bool clearBeforeReindex);
=======
void ReindexDescendants(int rootID, bool clearBeforeReindex);
>>>>>>>
/// <param name="clearBeforeReindex"></param>
void ReindexDescendants(int rootID, bool... |
<<<<<<<
using System.Collections.Generic;
using System.Diagnostics;
=======
using System.Collections.Generic;
using System.Diagnostics;
>>>>>>>
using System.Collections.Generic;
using System.Diagnostics;
<<<<<<<
using N2.Collections;
using N2.Security;
=======
using N2.Collections;
using N2.Security;
>>>>>>>
usi... |
<<<<<<<
using System.Linq;
using System.Reflection;
=======
using System.Web.UI;
using System.Reflection;
using System.Web;
using System.Collections;
using System.IO;
using N2.Engine.Globalization;
using System.Text;
>>>>>>>
using System.Linq;
using System.Web.UI;
using System.Reflection;
using System.Web;
using Sys... |
<<<<<<<
return finder.Find<ServiceAttribute>(typeof(object), false)
.Where(t => !t.Type.IsAbstract)
.Where(t => !t.Type.IsInterface)
.Where(t => !t.Type.IsEnum)
.Where(t => !t.Type.IsValueType)
.Where(t => t.Type.IsPublic)
.Select(ai => new AttributeInfo<ServiceAttribute> { Attribute = ai.Att... |
<<<<<<<
if (preHandlers != null && (VersionsTriggersEvents || item.VersionOf == null))
=======
if (handler != null && (VersionsTriggersEvents || !item.VersionOf.HasValue))
>>>>>>>
if (preHandlers != null && (VersionsTriggersEvents || !item.VersionOf.HasValue)) |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Security;
using Dinamico.Models;
using N2;
using N2.Definitions;
using N2.Engine.Globalization;
using N2.Persistence.Search;
using N2.Web;
using N2.Web.Mvc;
namespace Dinamico.Controllers
{
/// <s... |
<<<<<<<
{
get { return (object)GetDetail("ObjectProperty"); }
set { SetDetail<object>("ObjectProperty", value); }
}
[EditableEnum]
public virtual AppDomainManagerInitializationOptions EnumProperty
{
get { return GetDetail("EnumProperty", AppDomainManagerInitializationOptions.None); }
set { SetDet... |
<<<<<<<
_ObjectStore.MarkSerialized(nested);
string nestedObjectPath = Path.Combine(alphaPath, removeInvalidFile(uniqueIdProperty.GetValue(nested).ToString()));
=======
_ObjectStore.MarkEncountered(nested, ref nextID);
string nestedObjectPath = Path.Combine(alphaPath, r... |
<<<<<<<
[Test]
public void Find_TypeAndParent_ShouldOnlyInclude_ItemWithSpecified_TypeAndParent()
{
ContentItem root = CreateOneItem<Definitions.PersistableItem1>(0, "page", null);
ContentItem child1 = CreateOneItem<Definitions.PersistableItem1>(0, "page1", root);
ContentItem child2 = CreateOneItem<Defin... |
<<<<<<<
private void CreateDirectoryPath(DirectoryInfo directory)
{
if (directory == null || directory.Exists)
return;
CreateDirectoryPath(directory.Parent);
directory.Create();
}
public virtual Stream OpenFile(string virtualPath, bool readOnly = false)
=======
[Obsolete("Change to OpenFile(st... |
<<<<<<<
using N2.Persistence;
=======
using N2.Definitions;
>>>>>>>
using N2.Definitions;
using N2.Persistence; |
<<<<<<<
=======
using N2.Edit.Settings;
using N2.Definitions;
>>>>>>>
using N2.Edit.Settings;
using N2.Definitions; |
<<<<<<<
_timestamp = DateTime.Now;
=======
>>>>>>>
<<<<<<<
var hello = HelloPrxHelper.uncheckedCast(c.adapter.addWithUUID(new HelloI(_name, _nextId++)));
=======
HelloPrx hello = HelloPrxHelper.uncheckedCast(current.adapter.addWithUUID(new HelloI(_name, _nextId++)));
>>>>>>>
... |
<<<<<<<
case AvailableSensors.WebcamActiveSensor:
DetectionMode detectionMode;
switch ((WebcamDetectionMode)model.DetectionMode)
{
case WebcamDetectionMode.Registry:
detectionMode = DetectionM... |
<<<<<<<
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId?>
=======
[DataTypeId(DataTypeIds.ExpandedNodeId)]
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId>
>>>>>>>
[DataTypeId(DataTypeIds.ExpandedNodeId)]
public sealed class ExpandedNodeId : IEquatable<ExpandedNodeId... |
<<<<<<<
namespace EVEMon.Gateways.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
internal sealed partial class Se... |
<<<<<<<
using System;
using System.IO;
=======
using System;
>>>>>>>
using System;
using System.IO; |
<<<<<<<
var flowListViewRef = new WeakReference<FlowListView>(this);
ItemTemplate = new FlowDataTemplateSelector(flowListViewRef);
SeparatorVisibility = SeparatorVisibility.None;
SeparatorColor = Color.Transparent;
=======
var flowListViewRef = new WeakReference<FlowListView>... |
<<<<<<<
true,
SettingsClient.Get<string>("Appearance", "ColorScheme"));
Container.Resolve<IExternalControlService>();
=======
true
);
>>>>>>>
true
);
Container.Resolve<IExternalControlService>(); |
<<<<<<<
=======
new ExternalComponent
{
Name = "Json.NET",
Description = "Popular high-performance JSON framework for .NET",
Url = "https://github.com/JamesNK/Newtonsoft.Json",
LicenseUrl = "https://github.com/JamesNK/Newtonsoft.J... |
<<<<<<<
response.Content.LoadIntoBufferAsync().ContinueWith(t => mre.Set());
if (mre.WaitOne (Manager.DefaultOptions.RequestTimeout, true) == false) {
Log.E ("DefaultAuthHandler", "mre.WaitOne timed out");
}
=======
response.Content.L... |
<<<<<<<
static SettingsDialog()
{
foreach (SupportedFileInfo info in SupportedFilesHandler.Files)
{
foreach (string s in info._extensions)
{
_assocList.Add(FileAssociation.Get("." + s));
_typeList.Add(FileTyp... |
<<<<<<<
"/Scripts/slick.model.js",
"/Scripts/qp.js",
=======
>>>>>>>
"/Scripts/qp.js", |
<<<<<<<
string.Compare(l.Name, Id.ToString(), StringComparison.OrdinalIgnoreCase) == 0);
=======
string.Compare(l.Name, id.ToString(), StringComparison.CurrentCultureIgnoreCase) == 0);
}
private LockFileTargetLibrary FindLibraryInLockFile(LockFile lockFile)
... |
<<<<<<<
=======
using System.Linq;
using System.Diagnostics;
using System.Runtime.InteropServices;
>>>>>>>
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
<<<<<<<
return ProcessArgs(args);
=======
using (PerfTrace.Current.Ca... |
<<<<<<<
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments,
=======
".NET dependency restorer",
Accept.ZeroOrMoreArguments(),
>>>>>>>
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments(),
<<<<<<<
... |
<<<<<<<
using Microsoft.DotNet.Tools;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
=======
>>>>>>>
using Microsoft.DotNet.Tools; |
<<<<<<<
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
=======
using Microsoft.DotNet.Cli.Utils;
>>>>>>>
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
<<<<<<<
using Microsoft.DotNet.Tools.List;
using Microsoft.DotNet.Tools.Migrate;
using Microsoft.DotNet.Tools.... |
<<<<<<<
(_) => (store, store, packageInstallerMock),
=======
(location, forwardArguments) => (store, packageInstallerMock),
>>>>>>>
(location, forwardArguments) => (store, store, packageInstallerMock), |
<<<<<<<
Create.Command(
"pack",
LocalizableStrings.AppDescription,
Accept.ZeroOrMoreArguments,
CommonOptions.HelpOption(),
Create.Option(
"-o|--output",
LocalizableStrings.CmdOutputDirDesc... |
<<<<<<<
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(0);
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(0);
=======
mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(1);
mockProj.Propertie... |
<<<<<<<
// [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420"
[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
=======
[I... |
<<<<<<<
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller, IToolPackageUninstaller) CreateToolPackageStoresAndInstallerAndUninstaller(
DirectoryPath? nonGlobalLocation = null);
=======
internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStore... |
<<<<<<<
=======
using NuGet.Frameworks;
using Command = Microsoft.DotNet.Cli.Utils.Command;
>>>>>>>
using Command = Microsoft.DotNet.Cli.Utils.Command;
<<<<<<<
return 1;
}
catch (Exception e) when (!e.ShouldBeDisplayedAsError())
{
// If telemetry o... |
<<<<<<<
public const string TestSdkPackageName = "Microsoft.NET.Test.Sdk";
public const string TestSdkPackageVersion = "15.0.0-preview-20161024-02";
public const string XUnitPackageName = "xunit";
public const string XUnitPackageVersion = "2.2.0-beta3-build3402";
public const str... |
<<<<<<<
using Xunit.Abstractions;
=======
using Microsoft.Build.Utilities;
>>>>>>>
using Xunit.Abstractions;
using Microsoft.Build.Utilities; |
<<<<<<<
internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller) CreateToolPackageStoresAndInstaller(DirectoryPath? nonGlobalLocation = null);
=======
internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(
DirectoryPath? nonGlobalL... |
<<<<<<<
// Diagnostics
public const string DiagnosticCode = "DiagnosticCode";
public const string Message = "Message";
public const string FilePath = "FilePath";
public const string Severity = "Severity";
public const string StartLine = "StartLine";
public const ... |
<<<<<<<
[Fact]
public void It_resolves_assembly_conflicts_with_a_NETFramework_library()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
TestProject project = new TestProject()
{
... |
<<<<<<<
var commandPath = Env.GetCommandPath(_command, ".exe", ".cmd", "") ??
Env.GetCommandPathFromRootPath(AppContext.BaseDirectory, _command, ".exe", ".cmd", "");
=======
>>>>>>>
var commandPath = Env.GetCommandPath(_command, ".exe", ".cmd", "") ??
... |
<<<<<<<
_createToolPackageStoreAndInstaller = (_) => (_toolPackageStore, _toolPackageStoreQuery, CreateToolPackageInstaller());
=======
_createToolPackageStoreAndInstaller =
(location, forwardArguments) => (_toolPackageStore, CreateToolPackageInstaller());
>>>>>>>
... |
<<<<<<<
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments,
=======
".NET Publisher",
Accept.ZeroOrMoreArguments(),
>>>>>>>
LocalizableStrings.AppFullName,
Accept.ZeroOrMoreArguments(),
<<<<<<<
Co... |
<<<<<<<
using Parser = Microsoft.DotNet.Cli.Parser;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using Parser = Microsoft.DotNet.Cli.Parser;
<<<<<<<
var parser = Parser.Instance;
=======
CommandOption projectArguments = app.Option(
$"-e|--entries <{LocalizableStrin... |
<<<<<<<
_testRoot = helloWorldAsset.TestRoot;
var packCommand = new PackCommand(Log, helloWorldAsset.TestRoot);
packCommand.Execute();
_packageId = Path.GetFileNameWithoutExtension(packCommand.ProjectFile);
return packCommand.GetNuGetPackage(packageVersion... |
<<<<<<<
private Uri stubbedLocation;
private String stubbedTitle;
=======
>>>>>>> |
<<<<<<<
services.AddScoped<IMenuAdminPresenter, MenuAdminPresenter>();
services.AddScoped<IMenuAdminManager, MenuAdminManager>();
=======
services.AddScoped<ImageCleanerAdminService>();
>>>>>>>
services.AddScoped<IMenuAdminPresenter, MenuAdminPresenter>();
... |
<<<<<<<
IPagedList<PostViewModel> posts =
await blogPresenter.GetPostsFromMultiCategoriesAsync(categoriesIds, page, blogOptions.PostsPageSize);
=======
async Task<IPagedList<PostViewModel>> LoadDataAsync()
{
return await blogPresenter.GetCategoriesPos... |
<<<<<<<
using SunEngine.Commons.Cache.CachePolicy;
=======
using SunEngine.Commons.Cache.Services;
>>>>>>>
using SunEngine.Commons.Cache.CachePolicy;
using SunEngine.Commons.Cache.Services; |
<<<<<<<
// Site version 1.0.0-beta.11
=======
/// <summary>
/// Initial migration for FluentMigrator
/// </summary>
>>>>>>>
// Site version 1.0.0-beta.11
/// <summary>
/// Initial migration for FluentMigrator
/// </summary>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
using Magicodes.ExporterAndImporter.Core.Extension;
using Magicodes.ExporterAndImporter.Core.Models;
using Magicodes.ExporterAndImporter.Csv;
using Magicodes.ExporterAndImporter.Tests.Models.Export.ExportByTemplate_Test1;
using OfficeOpenXml.Drawing;
>>>>>>>
using Magicodes.ExporterAndImporter.Csv; |
<<<<<<<
get { return watinInstance.Uri; }
}
=======
get { return Watin.Uri; }
}
public bool ConsiderInvisibleElements
{
get { return elementFinder.ConsiderInvisibleElements; }
set { elementFinder.ConsiderInvisibleElements = value; }
... |
<<<<<<<
public GameObject player;
=======
private GameObject player;
>>>>>>>
private GameObject player;
<<<<<<<
=======
player = GameObject.FindGameObjectWithTag("Player");
>>>>>>>
player = GameObject.FindGameObjectWithTag("Player"); |
<<<<<<<
snapshotList = new List<Snapshot> ();
File.CreateText (fileName);
=======
>>>>>>>
File.CreateText (fileName);
<<<<<<<
if (recording)
RecordSnapshot();
if(recordKeys)
RecordKeys ();
=======
if (recording) {
frameDuration += Time.deltaTime;
if (frameDuration > recordingFrameDuratio... |
<<<<<<<
//using UnityEditor;
=======
#if UNITY_EDITOR
using UnityEditor;
#endif
>>>>>>>
using UnityEditor;
#if UNITY_EDITOR
using UnityEditor;
#endif
<<<<<<<
/* [CustomEditor(typeof(BombController))]
=======
#if UNITY_EDITOR
[CustomEditor(typeof(BombController))]
>>>>>>>
#if UNITY_EDITOR
[Cus... |
<<<<<<<
=======
private FakeDriver driver;
private SpyRobustWrapper spyRobustWrapper;
private Session session;
[SetUp]
public void SetUp()
{
driver = new FakeDriver();
spyRobustWrapper = new SpyRobustWrapper();
session = new Session(driver, spyRobustWrapper);
}
[TearDown]
publ... |
<<<<<<<
using ElasticLinq.Response.Model;
using System.Collections.Generic;
=======
using System;
>>>>>>>
using ElasticLinq.Response.Model;
using System;
using System.Collections.Generic;
<<<<<<<
[Fact]
public void SimpleSelectProducesValidMaterializer()
{
var translation = Elas... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.