Update task.md after conflict resolution

This commit is contained in:
Michael committed 2025-12-16 08:17:02 +01:00
1 parent 9326572fbc
commit a42f1edc3d
1 file changed
+3 -3
+3 -3
View File
@@ -43,6 +43,6 @@ Master Plan:
## 🔧 Git Maintenance
- [ ] **Resolve Conflicts**:
- [ ] `bin/api/streaming_handler.dart`
- [ ] `lib/features/iptv/services/xtream_service.dart`
- [x] **Resolve Conflicts**:
- [x] `bin/api/streaming_handler.dart`
- [x] `lib/features/iptv/services/xtream_service.dart`