Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveSkender committed Nov 11, 2024
1 parent 438dc8a commit 250893e
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/_common/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,3 @@
[assembly: CLSCompliant(true)]
[assembly: InternalsVisibleTo("Tests.Indicators")] // these test internals
[assembly: InternalsVisibleTo("Tests.Performance")]
<<<<<<< HEAD

namespace Skender.Stock.Indicators;

/// <summary>Technical indicators and overlays. See
/// <see href = "https://dotnet.stockindicators.dev/guide.md">
/// the Guide</see> for more information.</summary>
public static partial class Indicator
{
private static readonly CultureInfo EnglishCulture = new("en-US", false);
private static readonly Calendar EnglishCalendar = EnglishCulture.Calendar;

// Gets the DTFI properties required by GetWeekOfYear.
private static readonly CalendarWeekRule EnglishCalendarWeekRule
= EnglishCulture.DateTimeFormat.CalendarWeekRule;

private static readonly DayOfWeek EnglishFirstDayOfWeek
= EnglishCulture.DateTimeFormat.FirstDayOfWeek;
}
=======
>>>>>>> v3

0 comments on commit 250893e

Please sign in to comment.