merge

1 files changed, 4 insertions, 3 deletions

diff --git a/pbs.sql b/pbs.sql
index 7a0524a..f74d570 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -197,7 +197,8 @@ CREATE TABLE IF NOT EXISTS `pbs_preboot` (
 ALTER TABLE `pbs_preboot`
   ADD CONSTRAINT `pbs_preboot_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
   ADD CONSTRAINT `pbs_preboot_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
-    
+
+
 CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
   `bootisoID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,  
@@ -213,12 +214,12 @@ CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
   KEY `groupID` (`groupID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
+
 ALTER TABLE `pbs_bootiso`
   ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
   ADD CONSTRAINT `pbs_bootiso_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
   ADD CONSTRAINT `pbs_bootiso_ibfk_3` FOREIGN KEY (`prebootID`) REFERENCES `pbs_preboot` (`prebootID`) ON DELETE CASCADE;
 
-  
 CREATE TABLE IF NOT EXISTS `pbs_client` (
   `clientID` int(11) NOT NULL AUTO_INCREMENT,
   `macadress` varchar(17) NOT NULL,
@@ -328,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` (
   `filterID` int(11) NOT NULL,
   `filtertypeID` int(11) NOT NULL,
   `filtervalue` varchar(140) NOT NULL,
-  `filtervalue2` varchar(140) NOT NULL 
+  `filtervalue2` varchar(140) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 ALTER TABLE  `pbs_filterentries` CHANGE  `filtervalue2`  `filtervalue2` VARCHAR( 140 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL;
 ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;