diff options
| author |  Chris <[email protected]> | 2021-03-05 17:15:37 +0000 |
|---|---|---|
| committer | Chris <[email protected]> | 2021-03-05 17:15:37 +0000 |
| commit | 722d9b200d50b3bfdf9d665eb4b5b023aae0223e (patch) | |
| tree | 9e03eaa8f41003107fe3cde28682d31126a177ab | |
| parent | Improve doc string. (diff) | |
Fix Pipfile merge conflicts
| -rw-r--r-- | Pipfile | 1 | ||||
| -rw-r--r-- | Pipfile.lock | 18 |
2 files changed, 14 insertions, 5 deletions
@@ -14,6 +14,7 @@ sentry-sdk = "~=0.19" PyYAML = "~=5.3.1" "discord.py" = {extras = ["voice"], version = "~=1.5.1"} async-rediscache = {extras = ["fakeredis"], version = "~=0.1.4"} +emojis = "~=0.6.0" aiofiles = "~=0.6" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index d5f313d1..9d0a988e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "640043d117ada0863e85327e52288393fc6f08568f4bf1aeba53e0443fe7f8f0" + "sha256": "91281e9ed353fea748de3da19abd7bef402402b23fc78a1260dc8bf8bd2bd98c" }, "pipfile-spec": 6, "requires": { @@ -169,6 +169,14 @@ "index": "pypi", "version": "==1.5.1" }, + "emojis": { + "hashes": [ + "sha256:7da34c8a78ae262fd68cef9e2c78a3c1feb59784489eeea0f54ba1d4b7111c7c", + "sha256:bf605d1f1a27a81cd37fe82eb65781c904467f569295a541c33710b97e4225ec" + ], + "index": "pypi", + "version": "==0.6.0" + }, "fakeredis": { "hashes": [ "sha256:01cb47d2286825a171fb49c0e445b1fa9307087e07cbb3d027ea10dbff108b6a", @@ -585,11 +593,11 @@ }, "identify": { "hashes": [ - "sha256:70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66", - "sha256:9dfb63a2e871b807e3ba62f029813552a24b5289504f5b071dea9b041aee9fe4" + "sha256:2179e7359471ab55729f201b3fdf7dc2778e221f868410fedcb0987b791ba552", + "sha256:2a5fdf2f5319cc357eda2550bea713a404392495961022cf2462624ce62f0f46" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.5.13" + "markers": "python_full_version >= '3.6.1'", + "version": "==2.1.0" }, "mccabe": { "hashes": [ |