Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues3 Pull requests Projects Releases Wiki Activity Actions

Compare commits

..

No commits in common. "2a7929719b775141e1435d71ac4cb9e46082a29a" and "ed1b6b7e77ed12f77fb1a9b4bf9f959509b55bf9" have entirely different histories.
2a7929719b ... ed1b6b7e77

1 changed files with 0 additions and 4 deletions

4
includes/transformer/class-transformers-manager.php
View file

@ -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(