fixed merge conflict

This commit is contained in:
Ale 2024-03-15 23:23:29 +01:00
commit 9906e750ef
2 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
# MultiPastries # PluriPastries
MultiPastries is a pluralkit alternative for the revolt chat platform. PluriPastries is a pluralkit alternative for the revolt chat platform.
It supports creating members and sending messages as one of the members. It supports creating members and sending messages as one of the members.
## How to host the bot yourself. ## How to host the bot yourself.

View file

@ -1,13 +1,13 @@
{ {
"name": "cakebot-revolt", "name": "pluripastries",
"version": "1.0.0", "version": "0.5.0",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "", "author": "cake",
"license": "ISC", "license": "GPLv3",
"devDependencies": { "devDependencies": {
"bun-types": "^1.0.31", "bun-types": "^1.0.31",
"typescript": "^5.1.3", "typescript": "^5.1.3",