Skip to content

Commit

Permalink
fix: resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
njfamirm committed Dec 29, 2022
1 parent d6bae47 commit 052314d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions core/type/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@
"homepage": "https://github.com/AliMD/alwatr/tree/main/core/type#readme",
"bugs": {
"url": "https://github.com/AliMD/alwatr/issues"
},
"dependencies": {
"@alwatr/storage-client": "~0.26.0"
}
}
4 changes: 1 addition & 3 deletions core/type/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@
// files, include and exclude from the inheriting config are always overwritten.
"include": ["src/**/*.ts"],
"exclude": [],
"references": [
{"path": "../storage-client"}
]
"references": []
}
1 change: 0 additions & 1 deletion services/comment/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
{"path": "../../core/logger"},
{"path": "../../core/type"},
{"path": "../../core/storage-client"},
{"path": "../../core/type"},
]
}
3 changes: 3 additions & 0 deletions ui/ui-kit/src/chat/chat-message.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import {AlwatrDummyElement, css, customElement, html, nothing, property, DirectionMixin} from '@alwatr/element';

import type {TextMessage} from '@alwatr/type';

import './chat-avatar.js';
import './chat-bubble.js';

Expand Down

0 comments on commit 052314d

Please sign in to comment.