pro and smart conflict
This commit is contained in:
+5
-1
@@ -1,7 +1,11 @@
|
||||
import merge from "lodash/merge";
|
||||
import Mustache from "mustache";
|
||||
import { moment } from "obsidian";
|
||||
|
||||
import { LANGS } from "./langs";
|
||||
import { LANGS as LANGS_PRO } from "../pro/src/langs";
|
||||
import { LANGS as LANGS_BASIC } from "./langs";
|
||||
|
||||
const LANGS = merge(LANGS_BASIC, LANGS_PRO);
|
||||
|
||||
export type LangType = keyof typeof LANGS;
|
||||
export type LangTypeAndAuto = LangType | "auto";
|
||||
|
||||
Reference in New Issue
Block a user