diff options
Diffstat (limited to 'app/assets/stylesheets/framework/diffs.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/diffs.scss | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index e16ab5ee72f..a9925fb3621 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -2,10 +2,6 @@ .diff-file { margin-bottom: $gl-padding; - &.conflict { - border-top: 1px solid $border-color; - } - &.has-body { .file-title { box-shadow: 0 -2px 0 0 var(--white); |