resolve merge conflicts

Together-Java · Mar 19, 2024 · 3159bed · 3159bed
1 parent 75cec91
commit 3159bed
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/application/src/main/java/org/togetherjava/tjbot/config/Config.java b/application/src/main/java/org/togetherjava/tjbot/config/Config.java
@@ -44,6 +44,7 @@ public final class Config {
  private final HelperPruneConfig helperPruneConfig;
  private final FeatureBlacklistConfig featureBlacklistConfig;
  private final String selectRolesChannelPattern;
+ private final String memberCountCategoryPattern;
  private final ApplicationFormConfig applicationFormConfig;
  private final String memberCountCategoryPattern;
 
@@ -414,6 +415,15 @@ public String getSelectRolesChannelPattern() {
  return selectRolesChannelPattern;
  }
 
+ /**
+ * Gets the pattern matching the category that is used to display the total member count.
+ *
+ * @return the categories name types
+ */
+ public String getMemberCountCategoryPattern() {
+ return memberCountCategoryPattern;
+ }
+
  /**
  * The configuration related to the application form.
  *