NOBUG: Fixup commit to fix stuff wrongly changed on merge commits
On rewriting MDL-47491, we ended in a situation where these modifications had been incorporated via merge commits. And kept undetected by rebase -ip. In general, please, use merge commits only for solving conflicts, never as a replacement for fixup commits. To fix non-conflicting things, add new, proper, fixup commits.
This commit is contained in:
@@ -901,7 +901,7 @@ function print_container_end($return=false) {
|
||||
/**
|
||||
* Print a bold message in an optional color.
|
||||
*
|
||||
* @deprecated since Moodle 2.0 MDL-12345 - use $OUTPUT->notification instead.
|
||||
* @deprecated since Moodle 2.0 MDL-19077 - use $OUTPUT->notification instead.
|
||||
* @todo MDL-50469 This will be deleted in Moodle 3.3.
|
||||
* @param string $message The message to print out
|
||||
* @param string $classes Optional style to display message text in
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@
|
||||
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
$version = 2015092400.01; // YYYYMMDD = weekly release date of this DEV branch.
|
||||
$version = 2015120100.00; // YYYYMMDD = weekly release date of this DEV branch.
|
||||
// RR = release increments - 00 in DEV branches.
|
||||
// .XX = incremental changes.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user