suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove merge conflict remnants.

Browse Source
This commit is contained in:
Mathias Meyer 2014-12-10 13:36:11 +01:00
parent 60a8cd5a40
commit f8aaf2c2b2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/styles/top.sass
View File

@ -32,14 +32,10 @@
a.werehiring a.werehiring
background-color: #31363d background-color: #31363d
border-radius: 4px border-radius: 4px
<<<<<<< HEAD
padding: 8px 16px padding: 8px 16px
line-height: 20px line-height: 20px
margin-right: 80px margin-right: 80px
=======
padding: 6px 18px 6px 18px
display: inline display: inline
>>>>>>> b51ca7e50adb765bd44d2ad4aaf52707e4378dfd
li.traviscicom li.traviscicom
a a