From 3c1bddef8360080a564847bd43f322565053e3f3 Mon Sep 17 00:00:00 2001 From: Hugo A Date: Sat, 27 Aug 2022 11:19:51 +0200 Subject: [PATCH] =?UTF-8?q?conflits=20r=C3=A9solus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/libreqr/logo.less | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/themes/libreqr/logo.less b/themes/libreqr/logo.less index 6500523..e69de29 100755 --- a/themes/libreqr/logo.less +++ b/themes/libreqr/logo.less @@ -1,10 +0,0 @@ - -<<<<<<< HEAD -======= -:root { - // base64 -w 0 logo-light.png - --logo-light: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX///8AAABVwtN+AAAAWElEQVQoz43O0RHAMAgCUDZg/y3ZgKJtP8PF/LzkiApcFG3IVgVICB0cqCPH368jMvCffsLuPWMLmOQ+FMBxNqvgXCZ8xixGsSNppWsF33hFaLjD27Xioh5ZH8ftcymlGAAAAABJRU5ErkJggg=="); - // base64 -w 0 logo-dark.png - --logo-dark: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX///8AAABVwtN+AAAAXklEQVQoz43SsRHAIAxDUW3g/bfUBoqckDL/AgWvMFgcKGcIYCkjDSJ2JgwvhhFHZ9cn2vDt/oUNvkcS3MpNRuh0ew6iyyYjbDCPGa2+WxL8lCN6vZYy+nBxED/+xgWM9DYk64ncIgAAAABJRU5ErkJggg=="); -} ->>>>>>> upstream/main