diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9c20685..9cce2f1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,11 +4,8 @@ - - - @@ -378,7 +404,11 @@ - diff --git a/README.md b/README.md index 5115d19..54cc7da 100644 --- a/README.md +++ b/README.md @@ -38,4 +38,8 @@ Each Java Class is a **standalone mini-project** - Data verification - CI/CD - scheduled tasks / Batch jobs - - Unit Testing \ No newline at end of file +<<<<<<< HEAD + - Unit Testing +======= + - Unit Testing +>>>>>>> 3e3275919bf4da68d9306358f14f480350363511