Skip to content

Add intro about marxico and atom#19

Open
Erichain wants to merge 4 commits intomacdao:masterfrom
Erichain:addtools
Open

Add intro about marxico and atom#19
Erichain wants to merge 4 commits intomacdao:masterfrom
Erichain:addtools

Conversation

@Erichain
Copy link

@Erichain Erichain commented Dec 4, 2015

No description provided.

zhengyuchuan added 3 commits October 27, 2015 17:36
Signed-off-by: zhengyuchuan <jyamol520@gmail.com>
Signed-off-by: Erichain <jyamol520@gmail.com>
@Erichain Erichain closed this Dec 4, 2015
@Erichain Erichain deleted the addtools branch December 4, 2015 15:57
@Erichain Erichain restored the addtools branch December 4, 2015 15:58
Signed-off-by: Erichain <jyamol520@gmail.com>
@Erichain Erichain reopened this Dec 4, 2015
@Erichain
Copy link
Author

Erichain commented Dec 4, 2015

so, is there any conflicts ?

sorry, I haven't found any conflicts...

@macdao
Copy link
Owner

macdao commented Dec 6, 2015

@Erichain I didn't try these tools (Marxico/Kaleidoscope/Atom)
Please give me some time to evaluate them.
And these are some conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants