merge conflict

moderneinc · Aug 26, 2024 · 7ca07ec · 7ca07ec
1 parent 98c5605
commit 7ca07ec
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/io/moderne/organizations/Application.java b/src/main/java/io/moderne/organizations/Application.java
@@ -15,7 +15,8 @@ public static void main(String[] args) {
     }
 
     @Bean
-    GitRemote.Parser gitRemoteParser(ScmConfiguration scmConfiguration) {
+    GitRemote.Parser gitRemoteParser(ModerneConfiguration moderneConfiguration) {
+        ScmConfiguration scmConfiguration = moderneConfiguration.getScm();
         GitRemote.Parser gitRemoteParser = new GitRemote.Parser();
         scmConfiguration.getRepositories().forEach(scmRepository -> gitRemoteParser.registerRemote(scmRepository.getType(), scmRepository.getBaseUrl(), scmRepository.getAlternativeUrls()));
         return gitRemoteParser;