주석추가

@@ -13,9 +13,15 @@ var bucketName = "kindofyourdogimage";
 // s3 버킷의 엔드 포인트
 // s3 버킷의 엔드 포인트
 var bucketRegion = 'ap-northeast-2';
 var bucketRegion = 'ap-northeast-2';
 // access key
 // access key
+<<<<<<< HEAD
 var accessId= 'yourId';
 var accessId= 'yourId';
 // access secret key
 // access secret key
 var secretKey = 'yoursecretId';
 var secretKey = 'yoursecretId';
+=======
+var accessId= 'AKIAQVXKGU466IQYEGRN';
+// access secret key
+var secretKey = '0FrMPdZR6+AkMkabAyPZWrnsVVi9EaI9/IdrWKCm';
+>>>>>>> beb3f2225bf44a431a723a3c068f6a9c3f10686b
 // AWS Cognito 인증
 // AWS Cognito 인증
 AWS.config.update({
 AWS.config.update({
   region:bucketRegion,
   region:bucketRegion,