Merge pull request #96 from primer/jonrohan-patch-1

Revert license to SPDX format
primer · Jun 7, 2016 · f226a4a · f226a4a
2 parents 39fb9c6 + cd87c5f
commit f226a4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ Adds:
 
 - Installation docs https://github.com/primer/octicons/pull/94
 
+Fixes:
+
+- Revert license back to SPDX standard
+
 ### 4.0.0 (June 6, 2016)
 
 Adds:

diff --git a/package.json b/package.json
@@ -4,10 +4,7 @@
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://octicons.github.com",
   "author": "GitHub Inc.",
-  "license": [
-    "OFL-1.1",
-    "MIT"
-  ],
+  "license": "(OFL-1.1 OR MIT)",
   "style": "index.scss",
   "files": [
     "index.scss",