Skip to content

Commit

Permalink
chore: merge conflict fixed. (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
rawi-coding committed Jan 14, 2025
1 parent c9ac2c8 commit 68ffd4a
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import 'package:das_client/app/pages/journey/train_journey/widgets/header/depart
import 'package:das_client/app/pages/journey/train_journey/widgets/header/radio_channel.dart';
import 'package:das_client/app/widgets/assets.dart';
import 'package:das_client/app/widgets/das_text_styles.dart';
import 'package:das_client/app/widgets/widget_extensions.dart';
import 'package:sbb_design_system_mobile/sbb_design_system_mobile.dart';
import 'package:das_client/model/journey/journey.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:das_client/model/journey/journey.dart';
import 'package:sbb_design_system_mobile/sbb_design_system_mobile.dart';

class MainContainer extends StatelessWidget {
const MainContainer({super.key});
Expand Down

0 comments on commit 68ffd4a

Please sign in to comment.