From c3d2d359c2de34f07020d4de7fe6e4e2b5d42442 Mon Sep 17 00:00:00 2001
From: Andre Perunicic <perunicic@gmail.com>
Date: Sun, 22 Jun 2025 00:38:26 -0400
Subject: [PATCH] Fix merge conflict after adding the never repeat setting

---
 src/repeat/parsers.ts | 2 +-
 src/settings.ts       | 7 -------
 tsconfig.json         | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/repeat/parsers.ts b/src/repeat/parsers.ts
index 213b97d..214f51c 100644
--- a/src/repeat/parsers.ts
+++ b/src/repeat/parsers.ts
@@ -10,7 +10,7 @@ import {
   Strategy,
   TimeOfDay,
 } from './repeatTypes';
-import { DEFAULT_SETTINGS } from 'src/settings';
+import { DEFAULT_SETTINGS } from '../settings';
 
 const joinedUnits = 'hour|day|week|month|year';
 
diff --git a/src/settings.ts b/src/settings.ts
index a96c674..8ca449f 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -8,7 +8,6 @@ export interface RepeatPluginSettings {
   eveningReviewTime: string;
   defaultRepeat: Repeat;
   enqueueNonRepeatingNotes: boolean;
-  defaultRepeat: Repeat;
 }
 
 export const DEFAULT_SETTINGS: RepeatPluginSettings = {
@@ -24,10 +23,4 @@ export const DEFAULT_SETTINGS: RepeatPluginSettings = {
     repeatTimeOfDay: 'AM',
   },
   enqueueNonRepeatingNotes: false,
-  defaultRepeat: {
-    repeatStrategy: 'SPACED',
-    repeatPeriod: 1,
-    repeatPeriodUnit: 'DAY',
-    repeatTimeOfDay: 'AM',
-  },
 };
diff --git a/tsconfig.json b/tsconfig.json
index 0569975..e95d75b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,7 @@
     "isolatedModules": true,
     "jsx": "react",
     "strictNullChecks": true,
+    "esModuleInterop": true,
       "lib": [
         "DOM",
         "ES5",