Merge branch 'master' of https://github.com/vantienvnn/test-tag into …

…chucnang_c Conflicts: init.txt
vantienvnn · Jun 14, 2015 · f49eef1 · f49eef1
2 parents 5cf3b73 + f4ad39f
commit f49eef1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/init.txt b/init.txt
@@ -1 +1,2 @@
-code cua chuc nang c
+code cua chuc nang c
+code chuc nang d