이유제 / CultureGallery

Go to a project
Toggle navigation Toggle navigation pinning
송효섭
0959a9e0 2 parents d5b5b02a 2cf042d3

Merge branch 'master' of http://khuhub.khu.ac.kr/2019102210/CultureGallery into master

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
1 { 1 {
2 "name": "culturegallery", 2 "name": "culturegallery",
3 "version": "1.0.0", 3 "version": "1.0.0",
4 - "lockfileVersion": 2, 4 + "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 +<<<<<<< HEAD
7 +=======
6 "packages": { 8 "packages": {
7 "": { 9 "": {
8 "name": "culturegallery", 10 "name": "culturegallery",
...@@ -627,6 +629,7 @@ ...@@ -627,6 +629,7 @@
627 } 629 }
628 } 630 }
629 }, 631 },
632 +>>>>>>> fce0e2c2148edbd32673b720c8123f1b3aa99538
630 "dependencies": { 633 "dependencies": {
631 "accepts": { 634 "accepts": {
632 "version": "1.3.7", 635 "version": "1.3.7",
......