Skip to content

Commit 0d04d6a

Browse files
committed
fixed package.json file from merge
1 parent 2fbf23d commit 0d04d6a

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
{
22
"name": "@microfocus/ias-icons",
3-
<<<<<<< HEAD
43
"version": "1.1.11",
54
"description": "Icon font for CyberRes Identity and Access products",
65
"author": "Lynn Christensen <lynn.christensen@microfocus.com> and James Albright <james.albright>@microfocus.com>",
7-
=======
8-
"version": "1.1.13",
9-
"description": "Icon font for Micro Focus Identity, Access, and Security products",
10-
"author": "James Albright <james.albright>@microfocus.com> (https://github.com/jalbr74)",
11-
>>>>>>> 9f443e9909289741729e3f274460bebf0d393308
126
"license": "MIT",
137
"bugs": "https://github.com/microfocus/ias-icons/issues",
148
"homepage": "https://github.com/microfocus/ias-icons#readme",

0 commit comments

Comments
 (0)