mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 16:32:18 +02:00
MDL-74923 quiz: Remove erroneous merge conflict line
This commit is contained in:
parent
ee48f4ab99
commit
793b0f0ed9
@ -28,7 +28,6 @@ Overview of this plugin type at http://docs.moodle.org/dev/Quiz_reports
|
||||
- mod/quiz/report/default.php
|
||||
|
||||
|
||||
>>>>>>> 40c14e4712e... MDL-74923 quiz: move report base classes to local folder
|
||||
=== 3.9 ===
|
||||
|
||||
* Quiz report plugins defining capabilities used to require an extra string like
|
||||
|
Loading…
x
Reference in New Issue
Block a user