From 06067e75b905c511309c6d68cc5b334416b78c86 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 18 Jan 2018 20:41:35 -0500 Subject: Resolve conflict --- RGens/data/seniordesign/dbdata.gram | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'RGens/data') 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] -- cgit v1.2.3