add icon: FFmpeg fa-ffmpeg

closes ForkAwesome#74
davidbenque · Apr 17, 2018 · 7a433d0 · 7a433d0
1 parent 8ddd753
commit 7a433d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "9d20b64ede505c7e22d1b337079af516ba6e5a3876388182ebbe4cf4b549a1a4",
-    "current": "9d20b64ede505c7e22d1b337079af516ba6e5a3876388182ebbe4cf4b549a1a4"
+    "previous": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c",
+    "current": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -947,6 +947,10 @@
       "codepoint": 61826,
       "source": "svg/female.svg"
     },
+    "ffmpeg": {
+      "codepoint": 62223,
+      "source": "svg/ffmpeg.svg"
+    },
     "fighter-jet": {
       "codepoint": 61691,
       "source": "svg/fighter-jet.svg"

diff --git a/src/icons/icons.yml b/src/icons/icons.yml
@@ -6977,7 +6977,6 @@ icons:
     categories:
       - Brand Icons
 
-<<<<<<< HEAD
   - name:       Hackaday
     id:         hackaday
     unicode:    f30a
@@ -7018,3 +7017,11 @@ icons:
     url:        php.net
     categories:
       - Brand Icons
+
+  - name:       FFmpeg
+    id:         ffmpeg
+    unicode:    f30f
+    created:    1.0
+    url:        ffmpeg.org
+    categories:
+      - Brand Icons
diff --git a/src/icons/svg/ffmpeg.svg b/src/icons/svg/ffmpeg.svg