L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NOBUG: Fixup commit to fix stuff wrongly changed on merge commits

Browse Source 
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:
Eloy Lafuente (stronk7)
2015-12-03 18:52:25 +01:00
parent f2304bfb81
commit ef53650e8a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version.php
+1 -1
View File
@@ -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.