ci: remove autopr in ci (#1160)

(cherry picked from commit c22fdff) # Conflicts: # .github/workflows/autopr.yml # CHANGELOG.md
Finschia · Oct 27, 2023 · 8c81eb5 · 8c81eb5
1 parent b2e87a3
commit 8c81eb5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Event Breaking Changes
 
 ### Build, CI
+<<<<<<< HEAD
 * (ci) [\#1149](https://github.com/Finschia/finschia-sdk/pull/1149) fix github release ci error
+=======
+* (ci) [\#1078](https://github.com/Finschia/finschia-sdk/pull/1078) fix tag comments in github actions workflow docker.yml
+* (repo) [\#1157](https://github.com/Finschia/finschia-sdk/pull/1157) setup CODEOWNERS and backport action
+* (ci) [\#1160](https://github.com/Finschia/finschia-sdk/pull/1160) remove autopr ci
+>>>>>>> c22fdff89 (ci: remove autopr in ci (#1160))
 
 ### Document Updates