From eac37536e7f685f2842481b56224a1ccece110a2 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikeh@ydekproductions.com>
Date: Thu, 13 Jun 2013 11:36:28 -0300
Subject: [PATCH] Update AUTHORS.rst

[ci skip]
---
 AUTHORS.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 461d25d..c46b4da 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -41,4 +41,3 @@ Patches and Suggestions
 - `Jonathan Vanasco <https://github.com/jvanasco>`_, Debugging support, error_code tracking, Twitter error API tracking, other fixes
 - `DevDave <https://github.com/devdave>`_, quick fix for longs with helper._transparent_params
 - `Ruben Varela Rosa <https://github.com/rubenvarela>`_, Fixed search example
->>>>>>> Update stream example, update AUTHORS for future example fix