docs: Update based on review feedback.

openedx · Aug 10, 2022 · 0d16e05 · 0d16e05
1 parent 2922976
commit 0d16e05
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -63,7 +63,6 @@ Fixed
 
 - Used newer, non-deprecated name for middleware to add custom attributes to requests from edx-drf-extensions
 
->>>>>>> master
 2022-05-31
 **********
 

diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/CHANGELOG.rst b/python-template/{{cookiecutter.placeholder_repo_name}}/CHANGELOG.rst
@@ -20,6 +20,6 @@ Unreleased
 ************************************************
 
 Added
-_____
+=====
 
 * First release on PyPI.
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,6 @@ Fixed @@
     - Used newer, non-deprecated name for middleware to add custom attributes to requests from edx-drf-extensions
-    >>>>>>> master
 -05-31
     **********
@@ Expand Down @@