Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinports
kevinports committed Jan 22, 2020
2 parents 8c0f457 + 8af821f commit 3c3ce88
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ The table below outlines icons that were removed or renamed.
| done-all | :pencil2: | renamed | renamed to "checkmark-done" |
| fastforward | :pencil2: | renamed | renamed to "play-forward" |
| filing | :pencil2: | renamed | renamed to "file-tray" |
| freebsd-devil | :x: | deleted | |
| game-controller-a | :x: | deleted | |
| game-controller-b | :x: | deleted | added as "game-controller" |
| googleplus | :x: | deleted | |
| logo-freebsd-devil | :x: | deleted | |
| logo-game-controller-a | :x: | deleted | |
| logo-game-controller-b | :x: | deleted | added as "game-controller" |
| logo-googleplus | :x: | deleted | |
| hand | :x: | deleted | split into "hand-left" and "hand-right" |
| heart-empty | :pencil2: | renamed | renamed to "heart-outline" |
| jet | :x: | deleted | use "airplane" |
Expand All @@ -60,10 +60,10 @@ The table below outlines icons that were removed or renamed.
| notifications-outline | :x: | deleted | exists as circled version |
| outlet | :x: | deleted | |
| paper | :pencil2: | renamed | renamed to "newspaper" |
| polymer | :x: | deleted | |
| logo-polymer | :x: | deleted | |
| pie | :pencil2: | renamed | renamed to "pie-chart" |
| photos | :x: | deleted | use "image" or "images" |
| qr-code | :pencil2: | renamed | renamed to "qr-scanner" |
| qr-scanner | :pencil2: | renamed | renamed to "qr-code" |
| quote | :x: | deleted | |
| redo | :pencil2: | renamed | renamed to "arrow-redo" |
| reorder | :x: | deleted | added as "reorder-two", "reorder-three", "reorder-four" |
Expand All @@ -79,4 +79,4 @@ The table below outlines icons that were removed or renamed.
| switch | :pencil2: | renamed | renamed to "toggle" |
| text | :pencil2: | renamed | renamed to "chatbox-ellipsis" |
| undo | :pencil2: | renamed | renamed to "arrow-undo" |
| unlock | :pencil2: | renamed | renamed to "lock-open" |
| unlock | :pencil2: | renamed | renamed to "lock-open" |

0 comments on commit 3c3ce88

Please sign in to comment.