diff options
author | 2019-04-10 16:40:11 +0200 | |
---|---|---|
committer | 2019-04-10 16:40:11 +0200 | |
commit | fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4 (patch) | |
tree | 2051271328c390be6c78b0a214c948e0c0c5f865 /packages/typings/package.json | |
parent | add context menu for workspace drawer items (diff) | |
parent | test package order (diff) | |
download | ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.gz ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.zst ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.zip |
merge conflicts with latest develop
Diffstat (limited to 'packages/typings/package.json')
-rw-r--r-- | packages/typings/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/typings/package.json b/packages/typings/package.json index d0f7ffc43..5da8389d6 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/typings", | 2 | "name": "@meetfranz/typings", |
3 | "version": "0.0.10", | 3 | "version": "0.0.11", |
4 | "description": "TypeScript typings for internal and external projects", | 4 | "description": "TypeScript typings for internal and external projects", |
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", |
@@ -18,5 +18,5 @@ | |||
18 | "bugs": { | 18 | "bugs": { |
19 | "url": "https://github.com/meetfranz/franz/issues" | 19 | "url": "https://github.com/meetfranz/franz/issues" |
20 | }, | 20 | }, |
21 | "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" | 21 | "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" |
22 | } | 22 | } |