forked from jellyfin/jellyfin-web
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmerge_results.txt
More file actions
24 lines (23 loc) · 1.61 KB
/
Copy pathmerge_results.txt
File metadata and controls
24 lines (23 loc) · 1.61 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
## Merge Results
✅ Merged PR 7058 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7307 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7440 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7455 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7487 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7473 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7478 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7588 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7661 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7671 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7777 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7846 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7863 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7913 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7915 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 7992 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8025 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8191 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8237 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8242 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8244 (upstream GitHub) with conflict resolution (HEAD wins)
✅ Merged PR 8257 (upstream GitHub) with conflict resolution (HEAD wins)