xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
life
2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/blog/themes/default/theme.json
View File

@ -19,10 +19,7 @@
*/
{
"Name": "Leanote default theme",
<<<<<<< HEAD
"Desc": "",
=======
>>>>>>> dev-life
"Version": "1.0",
"Author": "leanote.com",
"AuthorUrl": "http://leanote.com",

3
public/blog/themes/elegant/theme.json
View File

@ -19,10 +19,7 @@
*/
{
"Name": "Leanote elegant",
<<<<<<< HEAD
"Desc": "",
=======
>>>>>>> dev-life
"Version": "1.0",
"Author": "leanote.com",
"AuthorUrl": "http://leanote.com",

3
public/blog/themes/nav_fixed/theme.json
View File

@ -19,10 +19,7 @@
*/
{
"Name": "Leanote nav fixed",
<<<<<<< HEAD
"Desc": "",
=======
>>>>>>> dev-life
"Version": "1.0",
"Author": "leanote.com",
"AuthorUrl": "http://leanote.com",