conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
var gitItem = (GitItem)GitTree.SelectedNode.Tag;
UICommands.StartArchiveDialog(this, selectedRevisions.First(), gitItem.FileName);
=======
var gitItem = (GitItem)GitTree.SelectedNode.Tag; // this should not fail, if it still does, user should know
UICommands.Sta... |
<<<<<<<
input = GitModule.UnquoteFileName(input);
Match regexMatch = Regex.Match(input, "[-]{3}[ ][\\\"]{0,1}[a]/(.*)[\\\"]{0,1}");
=======
input = GitCommandHelpers.UnquoteFileName(input);
Match regexMatch = Regex.Match(input, "[-]{3}[ ]... |
<<<<<<<
if (forcePush)
{
if (!form.ProcessArguments.Contains(" -f "))
form.ProcessArguments = form.ProcessArguments.Replace("push", "push -f");
form.Retry();
return true;
}
... |
<<<<<<<
public string NewVersion;
private readonly SynchronizationContext _syncContext;
=======
>>>>>>>
public string NewVersion; |
<<<<<<<
=======
this.Revisions.TabIndex = 0;
this.Revisions.Scroll += new System.Windows.Forms.ScrollEventHandler(this.Revisions_Scroll);
>>>>>>>
this.Revisions.TabIndex = 0;
<<<<<<<
=======
this.Revisions.CellContextMenuStripChanged += new System.Windows.Forms.Data... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Windows.Forms;
using GitUIPluginInterfaces;
namespace AutoCompileSubmodules
{
public class AutoCompileSubModules : IGitPluginForRepository
{
private const string MsBuildPath = @"C:\Windows\Microsof... |
<<<<<<<
Message.DefaultCellStyle.Font = SystemFonts.DefaultFont;
Author.DefaultCellStyle.Font = SystemFonts.DefaultFont;
Date.DefaultCellStyle.Font = SystemFonts.DefaultFont;
NormalFont = SystemFonts.DefaultFont;
HeadFont = new Font(NormalFont, FontStyle.Unde... |
<<<<<<<
private Task _loadThread;
=======
>>>>>>>
<<<<<<<
ThreadHelper.JoinableTaskFactory.RunAsync(
async () =>
=======
Action<FormGitStatistics> a = sender =>
{
var (commitsPerUser, totalCommits) = CommitCounter.GroupAllCommitsByContrib... |
<<<<<<<
MulticolorBranches.Checked = Settings.MulticolorBranches;
ColorTagLabel.BackColor = Settings.TagColor;
ColorTagLabel.Text = Settings.TagColor.Name;
ColorTagLabel.ForeColor = ColorHelper.GetForeColorForBackColor(ColorTagLabel.BackColor);
... |
<<<<<<<
FillBuildReport(); // Ensure correct page visibility
_formBrowseMenuCommands = new FormBrowseMenuCommands(this, aCommands, Module, RevisionGrid);
=======
_formBrowseMenuCommands = new FormBrowseMenuCommands(this, RevisionGrid);
>>>>>>>
FillBuildReport(); // ... |
<<<<<<<
string result;
if (Settings.FollowRenamesInFileHistory)
result = RunCachableCmd(Settings.GitCommand, "diff -M -z --name-status \"" + to + "\" \"" + from + "\"");
else
result = RunCachableCmd(Settings.GitCommand, "diff -z --name-status \"" + to ... |
<<<<<<<
// settingsToolStripMenuItem1
//
this.settingsToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.gitMaintenanceToolStripMenuItem,
this.toolStripSeparator4,
this.editgitignoreToolStripMenuItem1,
... |
<<<<<<<
this.localChangesGB.Size = new System.Drawing.Size(391, 53);
=======
this.localChangesGB.Size = new System.Drawing.Size(289, 51);
this.localChangesGB.MaximumSize = new System.Drawing.Size(Screen.FromControl(this).Bounds.Width, 51);
>>>>>>>
this.localChangesGB.S... |
<<<<<<<
headers = {{
'Authorization': 'Bearer ' + authToken,
'User-Agent': 'compute.rhino3d.py/' + __version__
}}
r = requests.post(url+endpoint, data=postdata, headers=headers)
=======
headers = {'Authorization': 'Bearer ' + authToken}
r = requests.post(posturl, data=postdata, hea... |
<<<<<<<
if (commitSha1 == null || !_IsCommitInRevisionGrid(commitSha1))
{
continue;
}
=======
if (commitSha1 == null || !_isCommitInRevisionGrid(commitSha1))
... |
<<<<<<<
dontSetAsDefaultToolStripMenuItem.Checked = Settings.DonSetAsLastPullAction;
//Close();
=======
dontSetAsDefaultToolStripMenuItem.Checked = Settings.DonSetAsLastPullAction;
GitUICommands.Instance.BrowseInitialize += (a, b) => Initialize();
>>>>>>>
... |
<<<<<<<
public static Control FindFocusedControl(this ContainerControl container)
{
var control = container.ActiveControl;
container = control as ContainerControl;
if (container == null)
return control;
else
return contain... |
<<<<<<<
TranslationString branchNewForRemote = new TranslationString("The branch you are about to push seems to be a new branch for the remote." + Environment.NewLine + "Are you sure you want to push this branch?");
=======
TranslationString pushToCaption = new TranslationString("Push to {0}");
>>>>>... |
<<<<<<<
private System.Windows.Forms.CheckBox MulticolorBranches;
=======
private System.Windows.Forms.TabPage TabPageGit;
private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.Label label50;
private System.Windows.Forms.GroupBox groupBox8;
priva... |
<<<<<<<
this.fileExplorerToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
=======
this.fileExplorerToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
this.fileExplorerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control... |
<<<<<<<
var original = stream.Position;
while (stream.Position < original + length)
=======
long original = stream.Position;
while (stream.Position < original + length.First)
>>>>>>>
var original = stream.Position;
while (stream.Position < origi... |
<<<<<<<
/// <summary>
/// Patches the checks for OuiAssistMode to include a check for OuiFileSelectSlot.ISubmenu as well.
/// </summary>
[MonoModCustomMethodAttribute("PatchOuiFileSelectSubmenuChecks")]
class PatchOuiFileSelectSubmenuChecksAttribute : Attribute { };
=======
/// <summary>
/... |
<<<<<<<
using Orleans.Runtime.Configuration;
using System.Collections.Generic;
=======
using System;
using System.Collections.Generic;
>>>>>>>
using System;
using System.Collections.Generic;
using Orleans.Runtime.Configuration;
using System.Collections.Generic;
<<<<<<<
public static void RegisterDashboard(t... |
<<<<<<<
else if (e.PropertyName == Map.IndoorEnabledProperty.PropertyName)
{
UpdateHasIndoorEnabled();
}
=======
else if (e.PropertyName == Map.PaddingProperty.PropertyName)
{
UpdatePadding();
}
>>>>>>>
... |
<<<<<<<
=======
// Screen fade logic
int animationTick = 0;
int animationLength = 20;
bool animationStarted = false;
>>>>>>>
<<<<<<<
foreach (var a in Game.world.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>()))
a.traits.Get<ChronoshiftPaletteEffect>().DoChronoshift();
=======
... |
<<<<<<<
var mobile = unit.traits.Get<Mobile>();
mobile.facing = 128;
mobile.QueueAction( new Traits.Mobile.MoveTo( unit.Location + new int2( 0, 3 ) ) );
world.AddFrameEndTask(_ => world.Add(unit));
// todo: make the producing building play `build`
}
=======
unit.Order(unit.Location + new int2(0,... |
<<<<<<<
//readonly SpriteHelper sh;
//readonly FontHelper fhDebug, fhTitle;
=======
readonly SpriteHelper sh;
readonly Font fDebug, fTitle;
Sheet textSheet;
SpriteRenderer rgbaRenderer;
Sprite textSprite;
>>>>>>>
readonly Font fDebug, fTitle;
Sheet textSheet;
SpriteRenderer rgbaRenderer;
Spri... |
<<<<<<<
public AddCommandCommand(IRepository repository, List<IBotCommand> allCommands)
: base(repository, UserRole.Mod)
=======
public AddCommandCommand(IRepository repository)
: base(UserRole.Mod, "AddCommand", "CommandAdd")
>>>>>>>
public AddCommandCommand(IReposito... |
<<<<<<<
builder.RegisterType<TopBallersCommand>().AsImplementedInterfaces().SingleInstance();
=======
builder.RegisterType<ScheduleCommand>().AsImplementedInterfaces().SingleInstance();
>>>>>>>
builder.RegisterType<TopBallersCommand>().AsImplementedInterfaces().SingleInstance();
... |
<<<<<<<
modelBuilder.Entity("DevChatter.Bot.Core.Data.Model.AliasEntity", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd();
b.Property<Guid?>("CommandId");
b.Property<string>("Word");
... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using Autofac;
>>>>>>>
using Autofac; |
<<<<<<<
var overrideUrl = GetRepositoryUrl(accountName, slug, null);
return _sharpBucketV2.Get(new Repository(), overrideUrl);
=======
var overrideUrl = GetRepositoryUrl(accountName, repository, null);
return _sharpBucketV2.Get<Repository>(overrideUrl);
>>>>>>>
... |
<<<<<<<
MessageEntry NMsg = new MessageEntry(MessageEntry.MessageType.Error, CurrentTaskGroup.Contact.Position.System, CurrentTaskGroup.Contact,
GameState.Instance.GameDat... |
<<<<<<<
int targetIndex = _moveTargetList.SelectedIndex;
=======
if (_starSystems.SelectedIndex == -1) //if b is not a valid selection
return;
int targetIndex = _targetList.SelectedIndex;
>>>>>>>
if (_starSystems.SelectedIndex == -1) //if b is not a v... |
<<<<<<<
public CustomApiService(ConfigWrapper options, IWorkingHoursService workingHoursService)
=======
public CustomApiService(BaseConfig options)
>>>>>>>
public CustomApiService(BaseConfig options, IWorkingHoursService workingHoursService) |
<<<<<<<
var cart = _shoppingCartService.GetShoppingCart(_storeContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
var model = await Task.Run(() => _shoppingCartViewModelService.PrepareOrderTotals(cart, isEditable));
=======
var cart = _workContext.C... |
<<<<<<<
var cart = _shoppingCartService.GetShoppingCart(_storeContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
=======
var cart = _workContext.CurrentCustomer.ShoppingCartItems
.Where(sci => sci.ShoppingCartType == ShoppingCartType.ShoppingCar... |
<<<<<<<
ILanguageService languageService,
ILocalizationService localizationService,
IMessageTokenProvider messageTokenProvider,
IPermissionService permissionService,
=======
ILanguageService languageService,
ILocalizationService localizationServ... |
<<<<<<<
using Telerik.Sitefinity.Modules.Blogs;
=======
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
>>>>>>>
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
using Telerik.Sitefinity.Modules.Blogs; |
<<<<<<<
/// <summary>
/// Gets the selector items.
/// </summary>
/// <value>The selector items.</value>
public ICollection<HtmlAnchor> SelectorItems
{
get
{
return this.Find.AllByExpression<HtmlAnchor>("ng-repeat=item in items");
... |
<<<<<<<
public bool SendEmailOnSuccess { get; set; }
/// <inheritDoc/>
public ActivationMethod ActivationMethod { get; set; }
/// <inheritDoc/>
=======
public string SuccessfulRegistrationMsg { get; set; }
/// <inheritDoc/>
public Guid? SuccessfulRegistration... |
<<<<<<<
#endregion
/// <summary>
/// Sets the e-tag value
/// </summary>
/// <param name="value">The e-tag value</param>
/// <returns>A CouchRequest with the new e-tag value</returns>
public CouchRequest Etag(string value)
=======
public ICouchRequest E... |
<<<<<<<
//TestCategory(FeatherTestCategories.MediaSelector),
TestCategory(FeatherTestCategories.ContentBlock)]
=======
TestCategory(FeatherTestCategories.MediaSelector),
TestCategory(FeatherTestCategories.ContentBlock),
Telerik.TestUI.Core.Attributes.KnownIssue(BugId = 210190)]... |
<<<<<<<
/// <summary>
/// word: Roles
/// </summary>
/// <value>Roles</value>
[ResourceEntry("Roles",
Value = "Roles",
Description = "word: Roles",
LastModified = "2015/03/03")]
public string Roles
{
get
... |
<<<<<<<
CommentsAllowSubscription = this.ThreadConfig.AllowSubscription && this.ThreadIsClosed,
=======
CommentDateTimeFormatString = this.DateTimeFormatString,
CommentsAllowSubscription = this.ThreadConfig.AllowSubscription && !this.ThreadIsClosed,
>>>>>>>
... |
<<<<<<<
/// <summary>
/// Gets word: URL
/// </summary>
[ResourceEntry("Url",
Value = "URL",
Description = "word : URL",
LastModified = "2015/04/27")]
public string Url
{
get
{
return this["Url"];... |
<<<<<<<
protected override IQueryable<IDataItem> GetItemsQuery()
{
if (this.ContentType == null)
throw new InvalidOperationException("ContentType cannot be inferred from the WidgetName. A required module might be deactivated.");
var manager = DynamicModuleManager... |
<<<<<<<
using System.Web;
=======
using System.Text;
using System.Text.RegularExpressions;
using System.Web;
>>>>>>>
using System.Web;
<<<<<<<
=======
/// <inheritDoc/>
public bool UseAjaxSubmit { get; set; }
/// <inheritDoc/>
public string AjaxSubmitTargetUrl { get; set; }
... |
<<<<<<<
/// <summary>
/// Indicates that the provided credentials are not valid.
/// </summary>
/// <value>The incorrect credentials.</value>
public bool IncorrectCredentials { get; set; }
=======
/// <summary>
/// Gets or sets a value indicating whether Remem... |
<<<<<<<
[ControllerToolboxItem(Name = "News_MVC", Title = "News", SectionName = ToolboxesConfig.ContentToolboxSectionName, ModuleName = "News", CssClass = "sfNewsViewIcn")]
=======
[ControllerToolboxItem(Name = "News", Title = "News", SectionName = "MvcWidgets", ModuleName = "News", CssClass = NewsController.... |
<<<<<<<
private const string templateNamePrefix = "Index.";
private const string templateName = "Default";
=======
internal const string WidgetIconCssClass = "sfSubmitBtnIcn sfMvcIcn";
private const string TemplateNamePrefix = "Index.";
private string templateName = "Default";... |
<<<<<<<
#region Fields
readonly IEnumerable<IRequester> _requesters;
readonly IDocument _document;
readonly Predicate<IRequest> _filter;
#endregion
#region ctor
=======
>>>>>>>
#region ctor |
<<<<<<<
=======
/// <inheritDocs />
[Browsable(false)]
public virtual IMetaField MetaField
{
get
{
if (this.Model.MetaField == null)
{
this.Model.MetaField = this.Model.GetMetaField(this);
}
... |
<<<<<<<
/// <summary>
/// Dynamic Widgets test category
/// </summary>
public const string DynamicWidgets = "DynamicWidgets";
=======
/// <summary>
/// New category for new tests
/// </summary>
public const string New = "New";
>>>>>>>
/// <su... |
<<<<<<<
/// Gets or sets the whether to send email message on successful registration confirmation.
/// </summary>
bool SendEmailOnSuccess { get; set; }
/// <summary>
/// Gets or sets the activation method.
/// </summary>
/// <value>
/// The activation me... |
<<<<<<<
Bind<IEmailCampaignsModel>().To<EmailCampaignsModel>();
Bind<IUnsubscribeFormModel>().To<UnsubscribeFormModel>();
=======
Bind<ISubscribeFormModel>().To<SubscribeFormModel>();
>>>>>>>
Bind<IUnsubscribeFormModel>().To<UnsubscribeFormModel>();
Bind<IS... |
<<<<<<<
=======
using System.Web;
>>>>>>>
using System.Web;
<<<<<<<
using Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Profile;
=======
using Telerik.Sitefinity.Web.Mail;
using Telerik.Sitefinity.Modules.UserProfiles;
>>>>>>>
using Telerik.Sitefinity.Web.Mail; |
<<<<<<<
//TestCategory(FeatherTestCategories.MediaSelector),
TestCategory(FeatherTestCategories.ContentBlock)]
=======
TestCategory(FeatherTestCategories.MediaSelector),
TestCategory(FeatherTestCategories.ContentBlock),
Telerik.TestUI.Core.Attributes.KnownIssue(BugId = 210190)]... |
<<<<<<<
using Telerik.Sitefinity.Frontend.Forms.Mvc.Models.Fields.Recaptcha;
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers;
=======
>>>>>>>
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers;
<<<<<<<
Initializer.CreateFormsGoogleRecaptchaFieldConfig();
... |
<<<<<<<
using Telerik.Sitefinity.Data;
using Telerik.Sitefinity.Frontend.Mvc;
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
=======
>>>>>>>
using Telerik.Sitefinity.Frontend.Mvc;
using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
<<<<<<<
[ControllerMetada... |
<<<<<<<
[ControllerToolboxItem(Name = "ChangePassword_MVC", Title = "Change password", SectionName = "Login", CssClass = "sfChangePasswordIcn")]
=======
[ControllerToolboxItem(Name = "ChangePasswordMVC", Title = "Change password", SectionName = "MvcWidgets", CssClass = ChangePasswordController.WidgetIconCssCl... |
<<<<<<<
/// Gets the next button on frontend
/// </summary>
public HtmlButton NextStepButton
{
get
{
return this.Get<HtmlButton>("TagName=button", "data-sf-btn-role=next");
}
}
/// <summary>
/// Gets the next bu... |
<<<<<<<
/// <summary>
/// Gets or sets the taxon size used for Cloud template.
/// </summary>
/// <value>The size of the cloud.</value>
public int CloudSize { get; set; }
=======
/// <summary>
/// Gets or sets the url of the taxon.
/// </summa... |
<<<<<<<
/// <summary>
/// phrase: Next image
/// </summary>
/// <value>Next image</value>
[ResourceEntry("NextImage",
Value = "Next image",
Description = "phrase: Next image",
LastModified = "2015/02/24")]
public string NextImage
... |
<<<<<<<
/// Verifies the image resizing properties.
/// </summary>
/// <param name="altText">The alt text.</param>
/// <param name="src">The SRC.</param>
public void VerifyImageResizingProperties(string altText, string srcWidth, string srcHeight, string srcQuality, string srcResi... |
<<<<<<<
[ControllerToolboxItem(Name = "Navigation_MVC", Title = "Navigation", SectionName = ToolboxesConfig.NavigationControlsSectionName, CssClass = "sfNavigationIcn")]
=======
[ControllerToolboxItem(Name = "Navigation", Title = "Navigation", SectionName = "MvcWidgets", CssClass = NavigationController.Widget... |
<<<<<<<
[ControllerToolboxItem(Name = "Profile_MVC", Title = "Profile", SectionName = "Users", CssClass = "sfProfilecn")]
=======
[ControllerToolboxItem(Name = "ProfileMVC", Title = "Profile", SectionName = "MvcWidgets", CssClass = ProfileController.WidgetIconCssClass)]
>>>>>>>
[ControllerToolboxItem(Nam... |
<<<<<<<
_db.ListCollections().ToList().Count(); //get the collection count so that db connection is established
=======
_db.ListCollections().ToList().Count(); //get the collection count so that first db connection is established
>>>>>>>
_db.ListCollections().ToList().... |
<<<<<<<
private int _frameForLastQueuedTranslation = -1;
private int _consecutiveFramesQueued = 0;
=======
private string _previouslyQueuedText = null;
private int _concurrentStaggers = 0;
>>>>>>>
private string _previouslyQueuedText = null;
private int _concurrentStaggers = 0;
... |
<<<<<<<
else if( UnityTextParsers.RegexSplittingTextParser.CanApply( ui ) && isBelowMaxLength )
=======
}
if( UnityTextParsers.RegexSplittingTextParser.CanApply( ui ) && isBelowMaxLength )
... |
<<<<<<<
using UnityEngine.UI;
using XUnity.AutoTranslator.Plugin.Core.Constants;
=======
using UnityEngine;
using XUnity.AutoTranslator.Plugin.Core.Configuration;
>>>>>>>
using UnityEngine;
using XUnity.AutoTranslator.Plugin.Core.Configuration;
using UnityEngine.UI;
using XUnity.AutoTranslator.Plugin.Core.Constants;... |
<<<<<<<
using Microsoft.Health.Dicom.Core.Messages.Delete;
=======
using Microsoft.Health.Dicom.Core.Messages.Retrieve;
>>>>>>>
using Microsoft.Health.Dicom.Core.Messages.Delete;
using Microsoft.Health.Dicom.Core.Messages.Retrieve;
<<<<<<<
public static Task<DeleteDicomResourcesResponse> DeleteDicomResourc... |
<<<<<<<
Guid.NewGuid().ToString(),
Guid.NewGuid().ToString(),
Guid.NewGuid().ToString(),
false,
false);
=======
DicomUID.Generate().UID,
DicomUID.Generate().UID,
DicomUID.Generate().UID);
>... |
<<<<<<<
using Dicom.Imaging;
=======
using System.Reflection;
>>>>>>>
using System.Reflection;
using Dicom.Imaging; |
<<<<<<<
using Microsoft.AspNetCore.Authorization;
=======
using BlogTemplate.Services;
>>>>>>>
using Microsoft.AspNetCore.Authorization;
using BlogTemplate.Services; |
<<<<<<<
public void UpdatePost(Post newPost, Post oldPost)
{
XDocument doc = XDocument.Load($"{StorageFolder}\\{oldPost.Slug}.xml");
//update info in file
//change file name to reflect new slug
doc.Root.Element("Title").Value = newPost.Title;
d... |
<<<<<<<
#region License
//
// Copyright (c) 2008-2011, Dolittle
//
// Licensed under the MIT License (http://opensource.org/licenses/MIT)
// With one exception :
// Commercial libraries that is based partly or fully on Bifrost and is sold commercially,
// must obtain a commercial license.
//
// You may not use thi... |
<<<<<<<
public IActionResult OnPostPublish()
{
InitializePost();
if (ModelState.IsValid)
{
Post.Comments.Add(Comment);
}
return Page();
}
=======
public void OnPostPublish()
{
}
... |
<<<<<<<
var resolver = document.Options.GetService<IEntityService>() ?? HtmlEntityService.Resolver;
_tokenizer = new HtmlTokenizer(document.Source, resolver);
=======
var options = document.Options;
var resolver = options.GetService<IEntityService>() ?? HtmlEntityServic... |
<<<<<<<
builder.Services.AddHttpClient();
builder.Services.AddRefitClient<IGitHubAuthApi>()
=======
builder.Services.AddRefitClient<IGitHubAuthApi>(RefitExtensions.GetNewtonsoftJsonRefitSettings())
>>>>>>>
builder.Services.AddHttpClient();
builder.Service... |
<<<<<<<
/// <summary>
/// Register a binding of a type to a callback that can resolve it with a given lifecycle
/// </summary>
/// <typeparam name="T">Type to register</typeparam>
/// <param name="container"><see cref="global::SimpleInjector.Container"/> to register into</param>... |
<<<<<<<
public class PlainTextOutput : MarshalByRefObject
{
private readonly TextWriter _writer;
public PlainTextOutput(TextWriter writer)
{
_writer = writer;
}
public void WriteLine(string text)
{
_writer.WriteLine(text);
}
public void WriteHeader()
{
Assembly executingAssembly = Ass... |
<<<<<<<
using System.Reflection;
using System.Text;
using System.Xml;
using NBehave.Console.Remoting;
=======
using System.Threading;
>>>>>>>
using System.Linq;
using System.Reflection;
using System.Threading;
using NBehave.Console.Remoting;
<<<<<<<
StoryResults results = SetupAndRunStories(options, out... |
<<<<<<<
Assert.Throws<DoesNotContainException>(() => "Lorem ipsum dolor sit amet".ShouldNotContain("ipsum"));
=======
Assert.Throws<DoesNotContainException>(() => {
"Lorem ipsum dolor sit amet".ShouldNotContain("ipsum");
});
>>>>>>>
Assert.Throws<DoesNo... |
<<<<<<<
if (metadata.IsCollectionType) {
validator = BuildCollectionValidator(prefix, metadata, validatorFactory);
=======
validator = _validatorFactory.GetValidator(metadata.ModelType);
if (validator == null && metadata.IsCollectionType) {
validator = BuildCollectionValidator(prefix, metadata)... |
<<<<<<<
object GetTheValue(Type propertyType, object value);
=======
IDictionary<string, object> ToDictionary(Subaccount subaccount);
>>>>>>>
IDictionary<string, object> ToDictionary(Subaccount subaccount);
object GetTheValue(Type propertyType, object value);
<<<<<<<
var ... |
<<<<<<<
IDictionary<string, object> ToDictionary(RelayWebhook relayWebhook);
IDictionary<string, object> ToDictionary(RelayWebhookMatch relayWebhookMatch);
=======
IDictionary<string, object> ToDictionary(InboundDomain inboundDomain);
>>>>>>>
IDictionary<string, object> ToDictionary(R... |
<<<<<<<
public HtmlQuoteElement(Document owner)
: this(owner, Tags.Quote)
{
}
public HtmlQuoteElement(Document owner, String name, String prefix = null)
: base(owner, name, prefix, name.Is(Tags.BlockQuote) ? NodeFlags.Special : NodeFlags.None)
=======
p... |
<<<<<<<
if (medium == null || token.IsNot(CssTokenType.Comma, CssTokenType.EndOfFile))
=======
if (medium == null || token.IsNot(CssTokenType.Comma, CssTokenType.Eof))
{
>>>>>>>
if (medium == null || token.IsNot(CssTokenType.Comma, CssTokenType.EndOfFil... |
<<<<<<<
=======
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Net;
using System.Windows;
using MySql.Data.MySqlClient;
>>>>>>> |
<<<<<<<
logging.AddToLog("API - GetObjectProperty error: " + ex.Message, true);
return dataset;
=======
AddToLog("API - GetObjectProperty error: " + ex.Message, true);
return props;
>>>>>>>
logging.AddToLog("API - GetObjectProperty error... |
<<<<<<<
if (value.Label == "Level")
{
OSAEObjectTypeManager.ObjectTypeMethodAdd("ON", "On", objType, "Level", "", "", "");
OSAEObjectTypeManager.ObjectT... |
<<<<<<<
public static void Html5Test()
{
//We require a custom configuration
var config = new Configuration();
//Including a script engine
config.Register(new JavaScriptEngine());
//And enabling scripting + styling (should be enabled anyway)... |
<<<<<<<
//System.Timers.Timer timer = new System.Timers.Timer();
System.Timers.Timer updates = new System.Timers.Timer();
//System.Timers.Timer checkPlugins = new System.Timers.Timer();
=======
private System.Timers.Timer timer = new System.Timers.Timer();
private System.Timers... |
<<<<<<<
=======
using System;
using System.Linq;
using System.Threading.Tasks;
>>>>>>>
using System;
using System.Linq;
using System.Threading.Tasks; |
<<<<<<<
public partial class StudentContactService : IStudentContactService
{
private readonly IStorageBroker storageBroker;
private readonly ILoggingBroker loggingBroker;
public StudentContactService(
IStorageBroker storageBroker,
ILoggingBroker loggingBroker)
{
this.storageBroker = storageBroker;
... |
<<<<<<<
[Fact]
public void ShouldRetrieveAllStudentSemesterCourses()
{
//given
IQueryable<StudentSemesterCourse> randomSemesterCourses =
CreateRandomStudentSemesterCourses();
IQueryable<StudentSemesterCourse> storageStudentSemesterCourses = r... |
<<<<<<<
[HttpGet]
public ActionResult<IQueryable<SemesterCourse>> GetAllSemesterCourse()
{
try
{
IQueryable storageClassrooms =
this.semesterCourseService.RetrieveAllSemesterCourse();
return Ok(storageClassrooms);
... |
<<<<<<<
[HttpGet]
public ActionResult<IQueryable<StudentSemesterCourse>> GetAllStudentSemesterCourse()
{
try
{
IQueryable storageStudentSemesterCourses =
this.studentSemesterCourseService.RetrieveAllStudentSemesterCourses();
... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Runtime.Serialization;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Runtime.Seria... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.