diff --git a/README.md b/README.md index 438f62c..c07b22f 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,8 @@ Chevereto Free includes all the basic image hosting stuff but it comes without d | Item | Free | Paid | |---------------------------------------------- |----------------- |------------------------ | | Contribution to Chevereto | ☆ | ★★★★ | -<<<<<<< HEAD | Access to latest features | Delayed | Always | | One click system update | Yes | Yes | -======= ->>>>>>> 0cba3b880f6c7de8489399f73159b78e3699160a | Tech support | No | Direct from developers | | External storage support | No | Yes | | Manage banners | No | Yes |