diff options
| author | Ryan Huber <rhuber@gmail.com> | 2015-07-20 11:04:01 -0400 |
|---|---|---|
| committer | Ryan Huber <rhuber@gmail.com> | 2015-07-20 11:04:01 -0400 |
| commit | 6437858049069864fc4fae0df90b765484363b52 (patch) | |
| tree | 2466ceea7cc64508960af4fa51f1334e78876326 | |
| parent | 3ce0216b324e3c09422a61eb1aece0018728e914 (diff) | |
| download | wee-slack-6437858049069864fc4fae0df90b765484363b52.tar.gz | |
derp
| -rw-r--r-- | wee_slack.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wee_slack.py b/wee_slack.py index f4c609c..815d15f 100644 --- a/wee_slack.py +++ b/wee_slack.py @@ -722,7 +722,6 @@ class DmChannel(Channel): class User(object): -<<<<<<< HEAD def __init__(self, server, name, identifier, presence="away", deleted=False): self.server = server self.name = name |