Merge.

smallrye · Dec 18, 2024 · 7ede552 · 7ede552
2 parents 4fd4160 + 28f3e0d
commit 7ede552
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/examples/liberty-car-booking/pom.xml b/examples/liberty-car-booking/pom.xml
@@ -49,11 +49,6 @@
                 <type>pom</type>
                 <scope>provided</scope>
             </dependency>
-<<<<<<< HEAD
-
-=======
-
->>>>>>> dcf66ac (Enable the Fault Tolerance Interceptor.)
 			<dependency>
 			    <groupId>ai.djl.huggingface</groupId>
 			    <artifactId>tokenizers</artifactId>