diff options
| author | Ben Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 20:41:35 -0500 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2018-01-18 21:48:35 -0400 |
| commit | 06067e75b905c511309c6d68cc5b334416b78c86 (patch) | |
| tree | e6571515a150140a9afe02164d2b51f0ebcc204e /RGens/data | |
| parent | 7a8560805f0469f929c4bb3e222a3a4606bfe651 (diff) | |
Resolve conflict
Diffstat (limited to 'RGens/data')
| -rw-r--r-- | RGens/data/seniordesign/dbdata.gram | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/RGens/data/seniordesign/dbdata.gram b/RGens/data/seniordesign/dbdata.gram index 0429490..5567438 100644 --- a/RGens/data/seniordesign/dbdata.gram +++ b/RGens/data/seniordesign/dbdata.gram @@ -16,14 +16,14 @@ pragma export-rule [user-role] -[dept-id] CS - IS +[dept-id] [synth+deptid] + +[real-deptid] CSIS MATH ENGL PHYS CHEM PSYC - [synth+deptid] pragma export-rule [dept-id] |