aboutsummaryrefslogtreecommitdiff
path: root/node_modules/simple-git/src/lib/tasks/merge.d.ts
diff options
context:
space:
mode:
authorScoots Dash <contact@minteck.org>2022-04-23 14:12:30 +0000
committerScoots Dash <contact@minteck.org>2022-04-23 14:12:30 +0000
commita927497b43cbe1438f3d7478932f3f7d03ea347c (patch)
tree0a3c88978b4294fb30afad58daa86c46fbedc2f6 /node_modules/simple-git/src/lib/tasks/merge.d.ts
parentba5fa694351774f2684c1aefdc215da5c6f39ba6 (diff)
parentf0db5bbbcd623812a391862d217519afafe197c6 (diff)
downloadtwilight-a927497b43cbe1438f3d7478932f3f7d03ea347c.tar.gz
twilight-a927497b43cbe1438f3d7478932f3f7d03ea347c.tar.bz2
twilight-a927497b43cbe1438f3d7478932f3f7d03ea347c.zip
Merge branch 'deprecation' into 'trunk'HEADtrunk
Disable the Twilight Package Manager See merge request minteck/twilight!1
Diffstat (limited to 'node_modules/simple-git/src/lib/tasks/merge.d.ts')
-rw-r--r--node_modules/simple-git/src/lib/tasks/merge.d.ts4
1 files changed, 0 insertions, 4 deletions
diff --git a/node_modules/simple-git/src/lib/tasks/merge.d.ts b/node_modules/simple-git/src/lib/tasks/merge.d.ts
deleted file mode 100644
index 663e80b..0000000
--- a/node_modules/simple-git/src/lib/tasks/merge.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { MergeResult } from '../../../typings';
-import { StringTask } from '../types';
-import { EmptyTask } from './task';
-export declare function mergeTask(customArgs: string[]): EmptyTask | StringTask<MergeResult>;