From 0401887b2455192d5f0118943c1d838d29867e30 Mon Sep 17 00:00:00 2001
From: Dillon Stadther <dlstadther@gmail.com>
Date: Fri, 19 Apr 2019 07:04:49 -0400
Subject: [PATCH] Remove merge conflict collateral from AUTHORS.rst

---
 AUTHORS.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 0e9af363..410a8b16 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -183,11 +183,9 @@ Patches and Suggestions
 - Shmuel Amar (`@shmuelamar <https://github.com/shmuelamar>`_)
 - Gary Wu (`@garywu <https://github.com/garywu>`_)
 - Ryan Pineo (`@ryanpineo <https://github.com/ryanpineo>`_)
-<<<<<<< HEAD
 - Ed Morley (`@edmorley <https://github.com/edmorley>`_)
 - Matt Liu <liumatt@gmail.com> (`@mlcrazy <https://github.com/mlcrazy>`_)
 - Taylor Hoff <primdevs@protonmail.com> (`@PrimordialHelios <https://github.com/PrimordialHelios>`_)
-<<<<<<< HEAD
 - Arthur Vigil (`@ahvigil <https://github.com/ahvigil>`_)
 - Nehal J Wani (`@nehaljwani <https://github.com/nehaljwani>`_)
 - Demetrios Bairaktaris (`@DemetriosBairaktaris <https://github.com/demetriosbairaktaris>`_)