김현기

주석추가

Showing 1 changed file with 6 additions and 0 deletions
...@@ -13,9 +13,15 @@ var bucketName = "kindofyourdogimage"; ...@@ -13,9 +13,15 @@ var bucketName = "kindofyourdogimage";
13 // s3 버킷의 엔드 포인트 13 // s3 버킷의 엔드 포인트
14 var bucketRegion = 'ap-northeast-2'; 14 var bucketRegion = 'ap-northeast-2';
15 // access key 15 // access key
16 +<<<<<<< HEAD
16 var accessId= 'yourId'; 17 var accessId= 'yourId';
17 // access secret key 18 // access secret key
18 var secretKey = 'yoursecretId'; 19 var secretKey = 'yoursecretId';
20 +=======
21 +var accessId= 'AKIAQVXKGU466IQYEGRN';
22 +// access secret key
23 +var secretKey = '0FrMPdZR6+AkMkabAyPZWrnsVVi9EaI9/IdrWKCm';
24 +>>>>>>> beb3f2225bf44a431a723a3c068f6a9c3f10686b
19 // AWS Cognito 인증 25 // AWS Cognito 인증
20 AWS.config.update({ 26 AWS.config.update({
21 region:bucketRegion, 27 region:bucketRegion,
......