diff --git a/README.md b/README.md index 5da96da..e69fb15 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<<<<<<< HEAD + # flutter_web_dashboard_demo -======= # prologium_project_demo A new Flutter project. @@ -17,4 +16,3 @@ A few resources to get you started if this is your first Flutter project: For help getting started with Flutter development, view the [online documentation](https://docs.flutter.dev/), which offers tutorials, samples, guidance on mobile development, and a full API reference. ->>>>>>> 9cdd211 (first commit)