Merge branch 'master' of

https://devtools.ncloud.com/2529009/consent-fatima.git

Conflicts:
	README.md

.gitignore

@@ -0,0 +1,23 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

README.md

@@ -1 +1,10 @@
-consent fatima
+<<<<<<< HEAD
+consent fatima
+=======
+## consent-fatima
+> Creator: account@lemonhc.com
+> Date: 2019/3/18
+
+## Description
+* consent-fatima에 대한 설명을 작성하세요
+>>>>>>> branch 'master' of https://devtools.ncloud.com/2529009/consent-fatima.git