diff options
Diffstat (limited to 'tidal_dl_ng/ui')
| -rw-r--r-- | tidal_dl_ng/ui/main.ui | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tidal_dl_ng/ui/main.ui b/tidal_dl_ng/ui/main.ui index 2b6d9ac..23d98e6 100644 --- a/tidal_dl_ng/ui/main.ui +++ b/tidal_dl_ng/ui/main.ui @@ -671,11 +671,6 @@ </property> <property name="icon"> <iconset theme="QIcon::ThemeIcon::MediaPlaybackPause"/> -<<<<<<< HEAD - <iconset theme="QIcon::ThemeIcon::MediaPlaybackStart"> - <normaloff>.</normaloff>.</iconset> -======= ->>>>>>> 13dddc7 (Refactor Dolby Atmos feature to be internal and seamless) </property> </widget> </item> |