10h30/trestle
1
0
Fork 0
mirror of https://github.com/10h30/trestle.git synced 2026-06-05 15:09:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict.

Browse Source
This commit is contained in:
MickeyKay
2015-05-11 17:16:18 -07:00
parent 2b989d7424
commit dfe92cbbf3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
-4
View File
@@ -1,9 +1,5 @@
Trestle
<<<<<<< HEAD
---------------------
=======
=======
>>>>>>> dev
### A handy boilerplate child theme for serious Genesis developers.
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/MickeyKay/trestle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)