김명현 / Classroom-Reservation

Go to a project
Toggle navigation Toggle navigation pinning
freckie
9332554d 2 parents 93d80006 dc51dd9d

Merge branch 'master' of https://github.com/freckie/Classroom-Reservation into master

Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
...@@ -3,8 +3,12 @@ An Web-based Classroom Reservation Service for Kyung Hee Univ. ...@@ -3,8 +3,12 @@ An Web-based Classroom Reservation Service for Kyung Hee Univ.
3 3
4 ## Maintainer 4 ## Maintainer
5 - Myung-Hyun Kim ([Github](https://github.cmm/freckie)) 5 - Myung-Hyun Kim ([Github](https://github.cmm/freckie))
6 -- Young-Min Ahn ([Github](https://github.com/ph-2)) 6 +- Young-Min An ([Github](https://github.com/ph-2))
7 7
8 ## Environment 8 ## Environment
9 +<<<<<<< HEAD
9 - Google Cloud Platform 10 - Google Cloud Platform
10 -- Google Apps Script
...\ No newline at end of file ...\ No newline at end of file
11 +- Google Apps Script
12 +=======
13 +(under development)
14 +>>>>>>> dc51dd9d3dfb4b5de20acc604b0f1da8fc38fd39
......