From 6f67832da65d86bc3d7c26bc18dd5705dfc08b6d Mon Sep 17 00:00:00 2001
From: fdai7599 <paul.kattenborn@informatik.hs-fulda.de>
Date: Fri, 9 Feb 2024 02:58:35 +0000
Subject: [PATCH] =?UTF-8?q?merge=20conflict=20aufl=C3=B6sen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d427c1a..4b4d00b 100644
--- a/pom.xml
+++ b/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>