Merge conflict

1 files changed, 0 insertions, 165 deletions

diff --git a/elpa/all-the-icons-20220325.1238/data/data-octicons.el b/elpa/all-the-icons-20220325.1238/data/data-octicons.el
deleted file mode 100644
index 432251e..0000000
--- a/elpa/all-the-icons-20220325.1238/data/data-octicons.el
+++ /dev/null
@@ -1,165 +0,0 @@
-(defvar all-the-icons-data/octicons-alist
-  '(
-
-    ("alert" . "\xf02d")
-    ("arrow-down" . "\xf03f")
-    ("arrow-left" . "\xf040")
-    ("arrow-right" . "\xf03e")
-    ("arrow-small-down" . "\xf0a0")
-    ("arrow-small-left" . "\xf0a1")
-    ("arrow-small-right" . "\xf071")
-    ("arrow-small-up" . "\xf09f")
-    ("arrow-up" . "\xf03d")
-    ("book" . "\xf007")
-    ("bookmark" . "\xf07b")
-    ("briefcase" . "\xf0d3")
-    ("broadcast" . "\xf048")
-    ("browser" . "\xf0c5")
-    ("bug" . "\xf091")
-    ("calendar" . "\xf068")
-    ("check" . "\xf03a")
-    ("checklist" . "\xf076")
-    ("chevron-down" . "\xf0a3")
-    ("chevron-left" . "\xf0a4")
-    ("chevron-right" . "\xf078")
-    ("chevron-up" . "\xf0a2")
-    ("circle-slash" . "\xf084")
-    ("circuit-board" . "\xf0d6")
-    ("clippy" . "\xf035")
-    ("clock" . "\xf046")
-    ("cloud-download" . "\xf00b")
-    ("cloud-upload" . "\xf00c")
-    ("code" . "\xf05f")
-    ("comment" . "\xf02b")
-    ("comment-discussion" . "\xf04f")
-    ("credit-card" . "\xf045")
-    ("dash" . "\xf0ca")
-    ("dashboard" . "\xf07d")
-    ("database" . "\xf096")
-    ("device-camera" . "\xf056")
-    ("device-camera-video" . "\xf057")
-    ("device-desktop" . "\xf27c")
-    ("device-mobile" . "\xf038")
-    ("diff" . "\xf04d")
-    ("diff-added" . "\xf06b")
-    ("diff-ignored" . "\xf099")
-    ("diff-modified" . "\xf06d")
-    ("diff-removed" . "\xf06c")
-    ("diff-renamed" . "\xf06e")
-    ("ellipsis" . "\xf09a")
-    ("eye" . "\xf04e")
-    ("file-binary" . "\xf094")
-    ("file-code" . "\xf010")
-    ("file-directory" . "\xf016")
-    ("file-media" . "\xf012")
-    ("file-pdf" . "\xf014")
-    ("file-submodule" . "\xf017")
-    ("file-symlink-directory" . "\xf0b1")
-    ("file-symlink-file" . "\xf0b0")
-    ("file-text" . "\xf011")
-    ("file-zip" . "\xf013")
-    ("flame" . "\xf0d2")
-    ("fold" . "\xf0cc")
-    ("gear" . "\xf02f")
-    ("gift" . "\xf042")
-    ("gist" . "\xf00e")
-    ("gist-secret" . "\xf08c")
-    ("git-branch" . "\xf020")
-    ("git-commit" . "\xf01f")
-    ("git-compare" . "\xf0ac")
-    ("git-merge" . "\xf023")
-    ("git-pull-request" . "\xf009")
-    ("globe" . "\xf0b6")
-    ("graph" . "\xf043")
-    ("beaker" . "\xf0dd")
-    ("heart" . "\x2665")
-    ("history" . "\xf07e")
-    ("home" . "\xf08d")
-    ("horizontal-rule" . "\xf070")
-    ("hourglass" . "\xf09e")
-    ("hubot" . "\xf09d")
-    ("inbox" . "\xf0cf")
-    ("info" . "\xf059")
-    ("issue-closed" . "\xf028")
-    ("issue-opened" . "\xf026")
-    ("issue-reopened" . "\xf027")
-    ("jersey" . "\xf019")
-    ("key" . "\xf049")
-    ("keyboard" . "\xf00d")
-    ("law" . "\xf0d8")
-    ("light-bulb" . "\xf000")
-    ("link" . "\xf05c")
-    ("link-external" . "\xf07f")
-    ("list-ordered" . "\xf062")
-    ("list-unordered" . "\xf061")
-    ("location" . "\xf060")
-    ("lock" . "\xf06a")
-    ("logo-github" . "\xf092")
-    ("mail" . "\xf03b")
-    ("mail-read" . "\xf03c")
-    ("mail-reply" . "\xf051")
-    ("mark-github" . "\xf00a")
-    ("markdown" . "\xf0c9")
-    ("megaphone" . "\xf077")
-    ("mention" . "\xf0be")
-    ("milestone" . "\xf075")
-    ("mirror" . "\xf024")
-    ("mortar-board" . "\xf0d7")
-    ("mute" . "\xf080")
-    ("no-newline" . "\xf09c")
-    ("octoface" . "\xf008")
-    ("organization" . "\xf037")
-    ("package" . "\xf0c4")
-    ("paintcan" . "\xf0d1")
-    ("pencil" . "\xf058")
-    ("person" . "\xf018")
-    ("pin" . "\xf041")
-    ("plug" . "\xf0d4")
-    ("plus" . "\xf05d")
-    ("primitive-dot" . "\xf052")
-    ("primitive-square" . "\xf053")
-    ("pulse" . "\xf085")
-    ("puzzle" . "\xf0c0")
-    ("question" . "\xf02c")
-    ("quote" . "\xf063")
-    ("radio-tower" . "\xf030")
-    ("repo" . "\xf001")
-    ("repo-clone" . "\xf04c")
-    ("repo-force-push" . "\xf04a")
-    ("repo-forked" . "\xf002")
-    ("repo-pull" . "\xf006")
-    ("repo-push" . "\xf005")
-    ("rocket" . "\xf033")
-    ("rss" . "\xf034")
-    ("ruby" . "\xf047")
-    ("search" . "\xf02e")
-    ("server" . "\xf097")
-    ("settings" . "\xf07c")
-    ("sign-in" . "\xf036")
-    ("sign-out" . "\xf032")
-    ("squirrel" . "\xf0b2")
-    ("star" . "\xf02a")
-    ("steps" . "\xf0c7")
-    ("stop" . "\xf08f")
-    ("sync" . "\xf087")
-    ("tag" . "\xf015")
-    ("telescope" . "\xf088")
-    ("terminal" . "\xf0c8")
-    ("three-bars" . "\xf05e")
-    ("thumbsdown" . "\xf0db")
-    ("thumbsup" . "\xf0da")
-    ("tools" . "\xf031")
-    ("trashcan" . "\xf0d0")
-    ("triangle-down" . "\xf05b")
-    ("triangle-left" . "\xf044")
-    ("triangle-right" . "\xf05a")
-    ("triangle-up" . "\xf0aa")
-    ("unfold" . "\xf039")
-    ("unmute" . "\xf0ba")
-    ("versions" . "\xf064")
-    ("x" . "\xf081")
-    ("zap" . "\x26A1")
-
-    ))
-
-(provide 'data-octicons)