feat:implementacion grafica 2.0

test/widget_test.dart

@@ -8,6 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+<<<<<<< HEAD
 // Use a local test app to avoid depending on external package imports
 // which may not exist in the test environment.
 class MyApp extends StatefulWidget {
@@ -36,6 +37,9 @@ class _MyAppState extends State<MyApp> {
     );
   }
 }
+=======
+import 'package:recoleccion_residuos/main.dart';
+>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {