diff --git a/src/_common/Globals.cs b/src/_common/Globals.cs index 98bbb3274..620494b62 100644 --- a/src/_common/Globals.cs +++ b/src/_common/Globals.cs @@ -3,24 +3,3 @@ [assembly: CLSCompliant(true)] [assembly: InternalsVisibleTo("Tests.Indicators")] // these test internals [assembly: InternalsVisibleTo("Tests.Performance")] -<<<<<<< HEAD - -namespace Skender.Stock.Indicators; - -/// Technical indicators and overlays. See -/// -/// the Guide for more information. -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