resolved conflict and re-bumped minor version, per PR comment suggestion

salesforce-ux · Nov 30, 2018 · 16fd6ec · 16fd6ec
1 parent 1faf497
commit 16fd6ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.1.1]
+
+### ⚠️ Breaking changes
+
+- Added `resolveMetaAliases` option to resolve aliases in metadata. - see [#172](https://github.com/salesforce-ux/theo/issues/172)
 
 ## [8.0.1]
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "theo",
-  "version": "8.0.1",
+  "version": "8.1.1",
   "license": "BSD-3-Clause",
   "description": "Design Tokens formatter",
   "keywords": [