diff --git a/README.md b/README.md index bd6f2e2..375691b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ # walkthrough_tutorial_javascript -UI5 Demo Kit \ No newline at end of file +<<<<<<< HEAD +UI5 Demo Kit +======= +SAP UI5 Develope Sample Source +>>>>>>> ac5c302b0f41478cb2601e5e8a8a64a2a9900e73