Merge branch 'issue3'

# Conflicts: # myfile.txt
wootaik · Feb 11, 2019 · ba130d7 · ba130d7
2 parents a31bb76 + f867584
commit ba130d7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/myfile.txt b/myfile.txt
@@ -1,4 +1,5 @@
 �����̵� ������ �� �ִ� Git
 add: ���� ������ ���� �ε����� ����� ����
 commit: �ε��� ���� ���
-merge: ���� �߰�
+merge: ���� �߰�
+pull: ���� ������� ���� ��������