obsidian-plugin/prncc_obsidian-repeat-plugin
1
0
Fork 0
mirror of https://github.com/prncc/obsidian-repeat-plugin.git synced 2026-07-22 06:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflict after adding the never repeat setting

Browse source
This commit is contained in:
Andre Perunicic 2025-06-22 00:38:26 -04:00
parent 8b8f79905d
commit c3d2d359c2
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/repeat/parsers.ts
View file

@ -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';

7
src/settings.ts
View file

@ -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',
},
};

1
tsconfig.json
View file

@ -13,6 +13,7 @@
"isolatedModules": true,
"jsx": "react",
"strictNullChecks": true,
"esModuleInterop": true,
"lib": [
"DOM",
"ES5",