Update Codicons: add 'merge'

microsoft · Jul 21, 2020 · f0646f8 · f0646f8
1 parent 57ad655
commit f0646f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
@@ -476,6 +476,7 @@ export namespace Codicon {
 	export const debugAltSmall = new Codicon('debug-alt-small', { character: '\\eba8' });
 	export const vmConnect = new Codicon('vm-connect', { character: '\\eba9' });
 	export const cloud = new Codicon('cloud', { character: '\\ebaa' });
+	export const merge = new Codicon('merge', { character: '\\ebab' });
 }