Skip to content

Commit

Permalink
fixed merge artifacts in README
Browse files Browse the repository at this point in the history
  • Loading branch information
molofgarb committed Feb 12, 2023
1 parent aa66802 commit db711dc
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
<<<<<<< HEAD
<h1 align=center>
<img src="resources/logo.ico?raw=true" alt="ytdl-gui logo" width="30"> ytdl-GUI
</h1>
=======
![ytdl-GUI logo](resources/logo.ico?raw=true "ytdl-gui logo")
>>>>>>> 72cbb86 (merge with main)

<div align=center><img alt="GitHub" src="https://img.shields.io/github/license/molofgarb/ytdl-GUI"></div>
<p align=center>A graphical user interface for the command line program, youtube-dlp, written in Python 3</p>

<<<<<<< HEAD

<div align=center><img src="resources/banner.png?raw=true" alt="ytdl-gui picture"></div>

=======
![ytdl-GUI](resources/banner.png?raw=true "ytdl-gui picture")

>>>>>>> 72cbb86 (merge with main)
---

# Installation
Expand All @@ -31,11 +22,6 @@ I have only been able to text the executable on a Windows 10 system. OSX and Lin
3. Install npm and use npm to install markdown-to-html.
4. Run make on the parent directory.

<<<<<<< HEAD
=======
---

>>>>>>> 72cbb86 (merge with main)
# Usage
1. Run the ytdl-GUI.exe program.

Expand All @@ -47,11 +33,6 @@ I have only been able to text the executable on a Windows 10 system. OSX and Lin

5. Enjoy your videos!

<<<<<<< HEAD
=======
---

>>>>>>> 72cbb86 (merge with main)
# Notes
- The program can be run using only the executable in the root -- ytdl-GUI.exe. The source code is found in ytdlGUI.py, and other assets can be found in the subdirectories.

Expand All @@ -62,27 +43,12 @@ program, since this program uses yt-dlp's module.

- yt-dlGUI_pyinstaller.bat is used to call pyInstaller to compile the script, ytdlGUI.py, along with its assets, into the final executable.

<<<<<<< HEAD
# Why?
I made this mostly for fun, but also to do a little experimentation with tkinter. I also make youtube videos occasionally, so I wanted something quick and lightweight to use for my occasional video downloads. There are a few other yt-dlp GUI programs that are much nicer than mine, so if you're looking for a more functionality, you should check those out.

# License
Licensed by the [MIT License](https://github.com/molofgarb/ytdl-GUI/blob/main/LICENSE).

=======
---

# Why?
I made this mostly for fun, but also to do a little experimentation with tkinter. I also make youtube videos occasionally, so I wanted something quick and lightweight to use for my occasional video downloads. There are a few other yt-dlp GUI programs that are much nicer than mine, so if you're looking for a more functionality, you should check those out.

---

# License
Licensed by the [MIT License](https://github.com/molofgarb/ytdl-GUI/blob/main/LICENSE).

---

>>>>>>> 72cbb86 (merge with main)
# Credits
yt-dlp and youtube-dl contributors for providing the tools needed for this program to work.

Expand Down

0 comments on commit db711dc

Please sign in to comment.