Skip to content

Commit

Permalink
Merge remote-tracking branch 'yomitan/master' into minimal-merge-yomitan
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanVukovic99 committed Dec 24, 2023
2 parents e283bec + 6550495 commit 062ebb0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions ext/js/background/backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {OptionsUtil} from '../data/options-util.js';
import {PermissionsUtil} from '../data/permissions-util.js';
import {ArrayBufferUtil} from '../data/sandbox/array-buffer-util.js';
import {DictionaryDatabase} from '../dictionary/dictionary-database.js';
import {DictionaryDatabase} from '../dictionary/dictionary-database.js';

Check failure on line 33 in ext/js/background/backend.js

View workflow job for this annotation

GitHub Actions / test

'DictionaryDatabase' is already defined
import {Environment} from '../extension/environment.js';
import {fetchText} from '../general/helpers.js';
import {ObjectPropertyAccessor} from '../general/object-property-accessor.js';
Expand Down
2 changes: 1 addition & 1 deletion ext/js/language/translator.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class Translator {
this._languageUtil = languageUtil;
/** @type {JapaneseUtil} */
this._japaneseUtil = japaneseUtil;
/** @type {DictionaryDatabase} */
/** @type {import('../dictionary/dictionary-database.js').DictionaryDatabase} */
this._database = database;
/** @type {?Deinflector} */
this._deinflector = null;
Expand Down
1 change: 1 addition & 0 deletions ext/js/templates/sandbox/anki-template-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import {Handlebars} from '../../../lib/handlebars.js';
import {AnkiNoteDataCreator} from '../../data/sandbox/anki-note-data-creator.js';
import {DictionaryDataUtil} from '../../dictionary/dictionary-data-util.js';
import {DictionaryDataUtil} from '../../dictionary/dictionary-data-util.js';
import {PronunciationGenerator} from '../../display/sandbox/pronunciation-generator.js';
import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js';
import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js';
Expand Down

0 comments on commit 062ebb0

Please sign in to comment.