diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
| commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
| tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages/theme/package.json | |
| parent | add workspaces count badge in settings navigation (diff) | |
| download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'packages/theme/package.json')
| -rw-r--r-- | packages/theme/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/theme/package.json b/packages/theme/package.json index 5c21a787f..3034d6347 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/theme", | 2 | "name": "@meetfranz/theme", |
| 3 | "version": "1.0.9", | 3 | "version": "1.0.11", |
| 4 | "description": "Theme configuration for Franz", | 4 | "description": "Theme configuration for Franz", |
| 5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
| 6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
| @@ -25,5 +25,5 @@ | |||
| 25 | "dependencies": { | 25 | "dependencies": { |
| 26 | "color": "^3.1.0" | 26 | "color": "^3.1.0" |
| 27 | }, | 27 | }, |
| 28 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 28 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
| 29 | } | 29 | } |