Fix syntax error made while resolving conflict

java-coding-prodigy · web-flow · commit 73ae2a9772a9 · 2023-09-29T17:35:27.000+05:30
diff --git a/application/src/main/java/org/togetherjava/tjbot/config/Config.java b/application/src/main/java/org/togetherjava/tjbot/config/Config.java
@@ -356,7 +356,6 @@ public JShellConfig getJshell() {
     }
 
     /**
-
      * Gets the config for the Starboard Contains the List of emoji names recognized by the
      * starboard as well as the name of the channel with the starboard.
      * 
@@ -365,6 +364,7 @@ public JShellConfig getJshell() {
     public StarboardConfig getStarboard() {
         return starboard;
 
+    /** 
      * Gets the config for automatic pruning of helper roles.
      *
      * @return the configuration

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,6 @@ public JShellConfig getJshell() {`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`/**`
`359`		`-`
`360`	`359`	`* Gets the config for the Starboard Contains the List of emoji names recognized by the`
`361`	`360`	`* starboard as well as the name of the channel with the starboard.`
`362`	`361`	`*`
`@@ -365,6 +364,7 @@ public JShellConfig getJshell() {`
`365`	`364`	`public StarboardConfig getStarboard() {`
`366`	`365`	`return starboard;`
`367`	`366`
	`367`	`+ /**`
`368`	`368`	`* Gets the config for automatic pruning of helper roles.`
`369`	`369`	`*`
`370`	`370`	`* @return the configuration`