OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

merge branch stable / resolved dummy merge conflict

Browse Source
This commit is contained in:
following
2012-08-24 17:04:55 +02:00
parent 900087fb57 a844185c34
commit 96861820ca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+1 -1
View File
@@ -11438,4 +11438,4 @@ TRUNCATE TABLE `watches_waitingtypes`;
INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('1', 'ownerlog');
INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('2', 'cache_watches');
INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '295fd1c3638b6f9503138a327fce620a') ON DUPLICATE KEY UPDATE `value`='295fd1c3638b6f9503138a327fce620a';
INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '295fd1c3638b6f9503138a327fce620a') ON DUPLICATE KEY UPDATE `value`='295fd1c3638b6f9503138a327fce620a';