Add note Brand Icon (ForkAwesome#363)

sivizius · Mar 7, 2023 · a3d092a · a3d092a
1 parent ae701a7
commit a3d092a
Showing 1 changed file with 0 additions and 25 deletions.
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
@@ -7912,28 +7912,3 @@ icons:
     url:        ubuntu.com
     categories:
       - Brand Icons
-<<<<<<< HEAD
-
-  - name:       note-com
-    id:         note-com
-    unicode:    f36d
-    created:    1.3
-    aliases:
-      - note-mu
-      - note-jp
-    url:        note.com
-    categories:
-      - Brand Icons
-
-
-
-=======
-
-  - name:       Strava
-    id:         strava
-    unicode:    f36c
-    created:    1.3
-    url:        strava.com
-    categories:
-      - Brand Icons
->>>>>>> e588d719 (Add Strava icon)