From 818972f11bd68ca9dce007ab6c0e57cd43aaf401 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 13 Dec 2019 09:05:54 +0100 Subject: [PATCH] Chore: Remove rejected files (#21072) These files get created when applying a patch with some hunks being rejected. These two files can be safely ignored. --- public/sass/_variables.dark.generated.scss.rej | 6 ------ public/sass/_variables.light.generated.scss.rej | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 public/sass/_variables.dark.generated.scss.rej delete mode 100644 public/sass/_variables.light.generated.scss.rej diff --git a/public/sass/_variables.dark.generated.scss.rej b/public/sass/_variables.dark.generated.scss.rej deleted file mode 100644 index 100525b5ed6..00000000000 --- a/public/sass/_variables.dark.generated.scss.rej +++ /dev/null @@ -1,6 +0,0 @@ -diff a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss (rejected hunks) -@@ -94,2 +94,2 @@ $textShadow: none; --$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); --$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); -+$brand-gradient-horizontal: linear-gradient(to right, #F05A28 30%, #FBCA0A 99%); -+$brand-gradient-vertical: linear-gradient(#F05A28 30%, #FBCA0A 99%); diff --git a/public/sass/_variables.light.generated.scss.rej b/public/sass/_variables.light.generated.scss.rej deleted file mode 100644 index e16225be503..00000000000 --- a/public/sass/_variables.light.generated.scss.rej +++ /dev/null @@ -1,6 +0,0 @@ -diff a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss (rejected hunks) -@@ -86,2 +86,2 @@ $text-shadow-faint: none; --$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); --$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); -+$brand-gradient-horizontal: linear-gradient(to right, #F05A28 30%, #FBCA0A 99%); -+$brand-gradient-vertical: linear-gradient(#F05A28 30%, #FBCA0A 99%);