From d1df1a077d9b40379e76f1657b4f0aa4f45e6214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=AB=20Bullard?=
 <68021211+chloeann95@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:34:37 -0500
Subject: [PATCH] fixed leftover conflict marker and blank line EOF errors,
 trailing whitespaces all removed

---
 AUTHORS.rst   | 4 ++--
 CHANGELOG.rst | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index f34a7e5b..d9e4100b 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,5 +1,5 @@
 Authors
-=======
+====================
 
 Christopher L. Farrow, Christopher James Wright, Pavol Juhas,
 Chia-Hao (Timothy) Liu, Timur Davis, S. Matthew Román, Simon J.L. 
@@ -8,4 +8,4 @@ Billinge
 Contributors
 ------------
 For a list of contributors, visit 
-https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
+https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
\ No newline at end of file
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f70095dd..c3361437 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,7 +9,4 @@ v0.0.1
 
 **Changed:**
 
-* Fixed rever GH address
-
-
-
+* Fixed rever GH address
\ No newline at end of file