From 042a0e07749be237bfada4480c4d3bd00ec24694 Mon Sep 17 00:00:00 2001
From: christolis <work@chris-sdogkos.com>
Date: Wed, 13 Mar 2024 17:36:05 +0200
Subject: [PATCH] resolve merge conflicts

---
 .../org/togetherjava/tjbot/config/Config.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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
index d845e0ce37..a207fabeba 100644
--- a/application/src/main/java/org/togetherjava/tjbot/config/Config.java
+++ b/application/src/main/java/org/togetherjava/tjbot/config/Config.java
@@ -43,8 +43,8 @@ public final class Config {
     private final JShellConfig jshell;
     private final FeatureBlacklistConfig featureBlacklistConfig;
     private final String selectRolesChannelPattern;
-    private final ApplicationFormConfig applicationFormConfig;
     private final String memberCountCategoryPattern;
+    private final ApplicationFormConfig applicationFormConfig;
 
     @SuppressWarnings("ConstructorWithTooManyParameters")
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
@@ -402,20 +402,20 @@ public String getSelectRolesChannelPattern() {
     }
 
     /**
-     * The configuration related to the application form.
+     * Gets the pattern matching the category that is used to display the total member count.
      *
-     * @return the application form config
+     * @return the categories name types
      */
-    public ApplicationFormConfig getApplicationFormConfig() {
-        return applicationFormConfig;
+    public String getMemberCountCategoryPattern() {
+        return memberCountCategoryPattern;
     }
 
     /**
-     * Gets the pattern matching the category that is used to display the total member count.
+     * The configuration related to the application form.
      *
-     * @return the categories name types
+     * @return the application form config
      */
-    public String getMemberCountCategoryPattern() {
-        return memberCountCategoryPattern;
+    public ApplicationFormConfig getApplicationFormConfig() {
+        return applicationFormConfig;
     }
 }