Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Translation finished:Windows wins the desktop, but Linux takes the world #5264

Merged
merged 4 commits into from Mar 11, 2017
Merged

Translation finished:Windows wins the desktop, but Linux takes the world #5264

merged 4 commits into from Mar 11, 2017

Conversation

Meditator-hkx
Copy link
Contributor

No description provided.

@ucasfl
Copy link
Contributor

ucasfl commented Mar 10, 2017

有冲突,不能合并

# Conflicts:
#	sources/talk/20170219 Windows wins the desktop, but Linux takes the
world.md
@Meditator-hkx
Copy link
Contributor Author

Now it should be possible to merge...

@ucasfl ucasfl merged commit f362f25 into LCTT:master Mar 11, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants