blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 00:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
Andreas Moik
2016-02-18 12:40:43 +01:00
parent d0eeba5afd bc33acb5ba
commit cdf2c0fa80
6 changed files with 672 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/dbupdate_3.2.php
+5 -2
View File
@@ -643,8 +643,6 @@ function printAllDroppedViews($allviews)
/***********************************************************ENDE SVNR ÄNDERUNG***********************************************************/
@@ -673,6 +671,7 @@ if($result = @$db->db_query("SELECT * FROM information_schema.table_constraints
<<<<<<< HEAD
//uhrzeit zu tbl_abschlusspruefung hinzufuegen
if(!$result = @$db->db_query("SELECT uhrzeit from lehre.tbl_abschlusspruefung LIMIT 1;"))
{
@@ -683,6 +682,10 @@ if(!$result = @$db->db_query("SELECT uhrzeit from lehre.tbl_abschlusspruefung LI
else
echo 'lehre.tbl_abschlusspruefung: spalte uhrzeit hinzugefügt';
}
=======
>>>>>>> bc33acb5ba38aaa75a13086c28ea68f0cc08cdfc