diff --git a/README.md b/README.md index 2c74cd366..e32b51407 100644 --- a/README.md +++ b/README.md @@ -2,24 +2,9 @@ Jellyseerr

-<<<<<<< HEAD Discord Docker pulls GitHub -======= -Overseerr Release -Overseerr CI -

-

-Discord -Docker pulls -Translation status -GitHub - -All Contributors - ->>>>>>> upstream/develop -

**Jellyseerr** is a free and open source software application for managing requests for your media library. It is a a fork of Overseerr built to bring support for Jellyfin & Emby media servers! @@ -154,10 +139,7 @@ Our [Code of Conduct](https://github.com/fallenbagel/jellyseerr/blob/develop/COD ## Contributing -<<<<<<< HEAD You can help improve Jellyseerr too! Check out our [Contribution Guide](https://github.com/fallenbagel/jellyseerr/blob/develop/CONTRIBUTING.md) to get started. -======= -You can help improve Overseerr too! Check out our [Contribution Guide](https://github.com/sct/overseerr/blob/develop/CONTRIBUTING.md) to get started. ## Contributors ✨