From fc3d89ad7422dedb8763783c6ebb5d70fcc2c536 Mon Sep 17 00:00:00 2001 From: "Emma [it/its]@Rory&" Date: Fri, 22 Mar 2024 17:45:19 +0100 Subject: Fix merge conficts between machines --- ExampleBots/ModerationBot | 2 +- ExampleBots/PluralContactBotPoC | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ExampleBots') diff --git a/ExampleBots/ModerationBot b/ExampleBots/ModerationBot index 8579db2..c137f94 160000 --- a/ExampleBots/ModerationBot +++ b/ExampleBots/ModerationBot @@ -1 +1 @@ -Subproject commit 8579db2c9099630b6a268015d586db73435032f0 +Subproject commit c137f94aeb122c636629fb9361dd73626594f690 diff --git a/ExampleBots/PluralContactBotPoC b/ExampleBots/PluralContactBotPoC index 7ef0970..4072e59 160000 --- a/ExampleBots/PluralContactBotPoC +++ b/ExampleBots/PluralContactBotPoC @@ -1 +1 @@ -Subproject commit 7ef0970090c1525a60063c0ba7c0a4bd9fd8cc22 +Subproject commit 4072e5922b671c9d93dbf9727123046054ca6dae -- cgit 1.4.1