-
Notifications
You must be signed in to change notification settings - Fork 0
/
1
26 lines (24 loc) · 823 Bytes
/
1
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Merge branch 'Tracks_MockUp' of https://github.com/BC-MAY-21-RN/proyecto-final-pf-n21-t3 into Tracks_MockUpa
a
# Conflicts:
# src/components/Tracks/TrackInfo.js
# src/screens/Tracks.js
#
# It looks like you may be committing a merge.
# If this is not correct, please run
# git update-ref -d MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch Tracks_MockUp
# Your branch and 'origin/Tracks_MockUp' have diverged,
# and have 3 and 2 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: src/components/Tracks/TrackInfo.js
# modified: src/screens/Tracks.js
#