diff --git a/lib/routes.dart b/lib/routes.dart index 048f9ecd..9c87ff2f 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,11 +1,8 @@ -<<<<<<< HEAD -======= import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/screens/patients/profile/insurance_approvals_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/patient_orders_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/progress_note_screen.dart'; ->>>>>>> 7f5831335b1fac9625ba368a5bca916aaa9b9d74 import './screens/patients/profile/vital_sign/body_measurements_screen.dart';