Commit 6998bf8b authored by Daniel Tefr's avatar Daniel Tefr
Browse files

fix: merge conflicts

parent a64e1bd3

lib/dashBoard/songPost/song_post.dart

+2 −0
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ import 'package:flutter/material.dart'; 
import 'package:get_it/get_it.dart';

import 'package:harmonis/dashBoard/songPost/song_post_detail_page.dart';

import 'package:harmonis/songPost/model/song_post_DTO.dart';

import 'package:harmonis/songPost/service/song_post_service.dart';

import 'package:harmonis/user/model/user_DTO.dart';

import 'package:harmonis/user/services/userService.dart';



class SongPost extends StatelessWidget {

  final SongPostDTO post;

  final songPostService = GetIt.instance<SongPostService>();

  final userService = GetIt.instance<UserService>();



  SongPost({

lib/dashBoard/songPost/song_post_detail_page.dart

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import 'package:harmonis/dashBoard/songPost/song_player.dart'; 
import 'package:harmonis/post/post_type.dart';

import 'package:harmonis/songPost/model/song_post_DTO.dart';

import 'package:harmonis/songPost/service/song_post_service.dart';

import 'package:harmonis/user/profile_page.dart';

import 'package:harmonis/user/services/userService.dart';

import '../../common/text_input_field.dart';

import 'package:harmonis/userInteraction/model/comment_DTO.dart';

lib/home_page.dart

+3 −0
Original line number Diff line number Diff line 
import 'package:flutter/material.dart';

import 'package:get_it/get_it.dart';

import 'package:harmonis/search/search_page.dart';

import 'package:harmonis/user/profile_page.dart';

import 'package:harmonis/user/services/userService.dart';

import 'addPost/add_song_post_page.dart';

import 'dashBoard/dash_board_page.dart';

import 'nav_bar.dart';