f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-03 19:12:41 +00:00
Code Wiki Activity

setup test file with phantomjs, no luck though

Browse Source
This commit is contained in:
Scott
2016-01-12 12:50:34 -08:00
committed by Scott Tolksdorf
parent db5d12992a
commit a193bccc86
10 changed files with 415 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/homebrew/phbStyle/phb.backup.less
View File

@@ -9,6 +9,7 @@
margin-bottom: 30px;
}
}
<<<<<<< HEAD:client/homebrew/phbStyle/phb.backup.less
@font-face {
font-family : BookInsanity;
src : url('/assets/homebrew/assets/Bookinsanity.otf');
@@ -390,4 +391,6 @@
font-size : 13pt;
font-weight : 900;
}
}
}
=======
>>>>>>> setup test file with phantomjs, no luck though:client/homebrew/phb/phb.less