diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -0,0 +1 @@ +