Solved merge conflicts

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 IT-REX
+Copyright (c) 2023 MEITREX
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -47,6 +47,6 @@ The endpoint for the GraphQL API is `/graphql`. The GraphQL Playground is availa
 ## Get started
 
 A guide how to start development can be
-found in the [wiki](https://gits-enpro.readthedocs.io/en/latest/dev-manuals/backend/get-started.html).
+found in the [wiki](https://meitrex.readthedocs.io/en/latest/dev-manuals/backend/get-started.html).
 
 

build.gradle

@@ -21,11 +21,12 @@ if (jacocoEnabled.toBoolean()) {
 }
 
 sonarqube {
-	properties {
-		property("sonar.projectKey", "MEITREX_flashcard_service")
-		property("sonar.organization", "meitrex-platform")
-		property("sonar.host.url", "https://sonarcloud.io")
-	}
+
+  properties {
+    property("sonar.projectKey", "MEITREX_flashcard_service")
+    property("sonar.organization", "meitrex")
+    property("sonar.host.url", "https://sonarcloud.io")
+  }
 
 }
 

pull_request_template.md

@@ -15,18 +15,18 @@ In case of manual test, please document the test well including a set of user in
 ## Checklist before requesting a review
 
 - [ ] My code is easy to understand
-- [ ] My code follows the [coding guidelines](https://github.com/IT-REX-Platform/wiki/blob/main/dev-manuals/backend/coding-guidelines.md) of this project
+- [ ] My code follows the [coding guidelines](https://github.com/MEITREX/wiki/blob/main/dev-manuals/backend/coding-guidelines.md) of this project
 - [ ] My code fulfills all acceptance criteria
 - [ ] The test coverage (line and branch) is reasonably high, especially on Service classes and other classes with complex logic
 - [ ] I have made corresponding changes to the documentation or
-  the [wiki/adr](https://github.com/IT-REX-Platform/wiki/tree/main/adr)
+  the [wiki/adr](https://github.com/MEITREX/wiki/tree/main/adr)
 - [ ] I made no breaking changes in the database schema or if so, I will perform a database migration
 
 ## Checklist for reviewer
 
 - The code is easy to understand
 - The code follows
-  the [coding guidelines](https://github.com/IT-REX-Platform/wiki/blob/main/dev-manuals/backend/coding-guidelines.md) of
+  the [coding guidelines](https://github.com/MEITREX/wiki/blob/main/dev-manuals/backend/coding-guidelines.md) of
   this project
 - The code is tested or if not, the reason is documented or discussed
 - The added and existing tests reasonably cover the code change

settings.gradle

@@ -6,5 +6,6 @@ sourceControl {
     }
     gitRepository(uri('https://github.com/MEITREX/common_test')) {
         producesModule('de.unistuttgart.iste.meitrex:meitrex-common-test')
-    }
+
+}
 }