Skip to content

Commit a69ed7f

Browse files
bourgeoabourgeoa
committed
resolve conflicts
1 parent 5bcb2df commit a69ed7f

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "solid-ui",
3-
"version": "2.4.14",
3+
"version": "2.4.14-bbf45639",
44
"description": "UI library for writing Solid read-write-web applications",
55
"main": "./lib/index.js",
66
"types": "./lib/index.d.ts",

‎src/chat/chatLogic.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import * as utils from '../utils'
1717
* Common code for a chat (discussion area of messages about something)
1818
* This version runs over a series of files for different time periods
1919
*
20-
* Parameters for the whole chat -- like its title -- are stored at
21-
* index.ttl#this and the chat messages are stored in YYYY/MM/DD/chat.ttl
20+
* Parameters for the whole chat like its title are stored on
21+
* index.ttl#this and the chats messages are stored in YYYY/MM/DD/chat.ttl
2222
*
2323
*/
2424

@@ -39,7 +39,7 @@ export class ChatChannel {
3939

4040
/* Store a new message in the web,
4141
as a replacement for an existing one.
42-
The old one is left, and the two are linked
42+
The old one iis left, and the two are linked
4343
*/
4444
async updateMessage (text, oldMsg = null, deleteIt) {
4545
const sts = []
@@ -81,7 +81,7 @@ export class ChatChannel {
8181
}
8282

8383
/* Mark a message as deleted
84-
* We add a new version of the message, with a deletion flag (deletion date)
84+
* Wee add a new version of the message,m witha deletion flag (deletion date)
8585
* so that the deletion can be revoked by adding another non-deleted update
8686
*/
8787
async deleteMessage (message) {

0 commit comments

Comments
 (0)