MDL-36621 calendar: fixed up conflict error
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 03:35:48 +0000 (16:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 03:35:48 +0000 (16:35 +1300)
commit59573bb447c4aabc42a3b972bf7d0bc89f0003f0
treeb9798c8f97f80627b905c072fcbc2fb601db54a5
parent36546841f19afa1ebbb40ca65da23967677e818b
MDL-36621 calendar: fixed up conflict error
lib/db/caches.php