From b1ca30f30e964bbdc229da5e8103a71f2f439e49 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 17 Nov 2016 13:39:55 -0800 Subject: [PATCH] Update server_sent_events.markdown --- source/developers/server_sent_events.markdown | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/developers/server_sent_events.markdown b/source/developers/server_sent_events.markdown index 0a9bfa6848b..6d9e9e1cd69 100644 --- a/source/developers/server_sent_events.markdown +++ b/source/developers/server_sent_events.markdown @@ -62,11 +62,7 @@ If you want to test the server-sent events without creating a website, the Pytho $ pip3 install sseclient ``` -<<<<<<< HEAD -The simplest script to consume the SSE looks like the following snippet. -======= -The simplest script to consume the SSE in Python looks like this: ->>>>>>> current +A simple script to consume SSE in Python looks like this: ```python from sseclient import SSEClient @@ -75,4 +71,3 @@ messages = SSEClient('http://localhost:8123/api/stream?api_password=YOUR_PASSWOR for msg in messages: print(msg) ``` -