Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@EvilCult
EvilCult committed Jun 6, 2019
1 parent 0c6aceb commit baeb8f4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<<<<<<< HEAD
# iptv-m3u-player
=======
## Live TV

#### 简介
Expand All @@ -14,4 +11,4 @@
目前仅打包了 Mac OS 的 App.

以上
>>>>>>> dev

0 comments on commit baeb8f4

Please sign in to comment.