Merge conflict

iamport · Nov 23, 2018 · cd0693f · cd0693f
2 parents 672ac75 + 96de62e
commit cd0693f
Show file tree

Hide file tree

Showing 146 changed files with 53,754 additions and 2,608 deletions.
diff --git a/README.md b/README.md
@@ -205,7 +205,7 @@
 
   class App extends React.Component {
     callback = (response) => { 
-      // 결제 성공/실패 여부에 따라 콜백처리
+      /* response에 따라 결제 성공/실패시 로직 작성 */
     }
 
     render() {
@@ -230,7 +230,7 @@
           callback={this.callback} // 결제 종료 후 콜백
           loading={{
             message: '잠시만 기다려주세요...', // 로딩화면 메시지 
-            image: require('img/iamport-logo.png') // 로딩화면 이미지
+            image: require('img/iamport-logo.png') // 커스텀 로딩화면 이미지
           }}
         />
       );
@@ -256,7 +256,7 @@
 
   class App extends React.Component {
     callback = (response) => { 
-      // 결제 성공/실패 여부에 따라 콜백처리
+      /* response에 따라 본인인증 성공/실패시 로직 작성 */
     }
 
     render() {
@@ -272,7 +272,7 @@
           callback={this.callback} // 본인인증 종료 후 콜백
           loading={{
             message: '잠시만 기다려주세요...', // 로딩화면 메시지 
-            image: require('img/iamport-logo.png') // 로딩화면 이미지
+            image: require('img/iamport-logo.png') // 커스텀 로딩화면 이미지
           }}
         />
       );

diff --git a/android/.project b/android/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1