Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15

# Conflicts: # services/build.gradle
2019-03-20 22:28:51 -06:00
parent f35777b5a6
commit f5f959b453
3 changed files with 15 additions and 22 deletions
@@ -16,7 +16,6 @@ values ('admin', 'secret', true),
 ('BrittanyBi', 'secret', true),
 ('lanlanzeliu', 'secret', true),
 ('tramanh305', 'secret', true);
-
 create table definitions (
 id int not null auto_increment primary key unique,
 name varchar(200) not null,