start fixing conflicts

This commit is contained in:
Peng Zhong 2016-05-13 10:14:04 +08:00
parent 20a54a0f13
commit 00e82f9949

View File

@ -943,14 +943,23 @@
],
"categories": [
{
"name": "GNU/Linux",
"subcategories": [
"Instant Messaging"
]
},
{
"name": "OS X",
"subcategories": [
"Instant Messaging"
]
},
{
"name": "Web Services",
"subcategories": [
"Instant Messaging"
]
},
{
"name": "Windows",
"subcategories": [