merge conflict auflösen

pom.xml

@@ -1,8 +1,4 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <properties>
-      <junit-jupiter-version>RELEASE</junit-jupiter-version>
-   </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.progmethoden</groupId>
   <artifactId>java-chat</artifactId>
@@ -24,7 +20,7 @@
      <dependency>
          <groupId>org.junit.jupiter</groupId>
          <artifactId>junit-jupiter</artifactId>
-         <version>${junit-jupiter-version}</version>
+         <version>RELEASE</version>
          <scope>test</scope>
      </dependency>