From d25a5c2d090ab157530f7d9bf2bdc906d7fc3781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Sat, 25 Nov 2023 10:31:40 +0100
Subject: [PATCH] fix: forgotten merge conflict

---
 includes/transformer/class-transformers-manager.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/includes/transformer/class-transformers-manager.php b/includes/transformer/class-transformers-manager.php
index cb0f701..1c39706 100644
--- a/includes/transformer/class-transformers-manager.php
+++ b/includes/transformer/class-transformers-manager.php
@@ -137,11 +137,7 @@ class Transformers_Manager {
 	 *
 	 * @return bool True if the ActivityPub transformer was registered.
 	 */
-<<<<<<< HEAD
-	public function register( \ActivityPub\Transformer\Base $transformer_instance) {
-=======
 	public function register( \ActivityPub\Transformer\Base $transformer_instance ) {
->>>>>>> ed1b6b7e77ed12f77fb1a9b4bf9f959509b55bf9
 
 		if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
 			_doing_it_wrong(