fixed merge conflict

README.md

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

package.json

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