From 95fa084893660b655388604084f082a080f1ba32 Mon Sep 17 00:00:00 2001
From: Ryan Huber <rhuber@gmail.com>
Date: Wed, 12 Apr 2017 16:47:43 +0000
Subject: massssssssive merge of the new codebase

---
 _pytest/data/websocket/1485975896.16-message.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 _pytest/data/websocket/1485975896.16-message.json

(limited to '_pytest/data/websocket/1485975896.16-message.json')

diff --git a/_pytest/data/websocket/1485975896.16-message.json b/_pytest/data/websocket/1485975896.16-message.json
new file mode 100644
index 0000000..3a9db89
--- /dev/null
+++ b/_pytest/data/websocket/1485975896.16-message.json
@@ -0,0 +1 @@
+{"text": "disabled an integration in this channel: <https://weeslacktest.slack.com/services/B3YTBU6L8|incoming-webhook>", "ts": "1485975896.000010", "subtype": "bot_disable", "user": "U4096CBHC", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94", "bot_id": "B3YTBU6L8"}
-- 
cgit