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

resolved merge pseudoconflict

Browse Source
This commit is contained in:
following
2012-08-13 14:00:33 +02:00
parent 9dcc8303d8 3a06d08a67
commit 4de76f686c
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+1 -1
View File
@@ -11300,4 +11300,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', '5fa57156ee245c10f95d831d06f042d6') ON DUPLICATE KEY UPDATE `value`='5fa57156ee245c10f95d831d06f042d6';
INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', 'bc9130761960bed6b629462454d88b43') ON DUPLICATE KEY UPDATE `value`='bc9130761960bed6b629462454d88b43';