projects
/
koha_ffzg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a740bcd
)
fixing failed merge in updatedatabase
author
Joshua Ferraro
<jmf@liblime.com>
Fri, 9 Nov 2007 01:07:45 +0000
(19:07 -0600)
committer
Joshua Ferraro
<jmf@liblime.com>
Fri, 9 Nov 2007 01:09:00 +0000
(19:09 -0600)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
updater/updatedatabase
patch
|
blob
|
history
diff --git
a/updater/updatedatabase
b/updater/updatedatabase
index
8c54bb0
..
34d03ce
100755
(executable)
--- a/
updater/updatedatabase
+++ b/
updater/updatedatabase
@@
-562,12
+562,6
@@
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
}
-
-
-
-
-=======
->>>>>>> BUMP to 021 : items.damaged added:updater/updatedatabase
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table