kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

removed conflict markers

Browse source
This commit is contained in:
Phil Hughes 2018-04-30 09:49:51 +01:00
parent fd43419ace
commit 87eb66e7b3
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/pages/repo.scss
View file

@ -68,8 +68,6 @@
}
}
<<<<<<< HEAD
=======
.ide-file-icon-holder {
display: flex;
align-items: center;
@ -83,7 +81,6 @@
}
}
>>>>>>> master
.ide-new-btn {
display: none;
margin-right: -8px;