diff options
Diffstat (limited to 'blog/2020/04/11/iteration_planning_note_april_11.mdwn')
| -rw-r--r-- | blog/2020/04/11/iteration_planning_note_april_11.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blog/2020/04/11/iteration_planning_note_april_11.mdwn b/blog/2020/04/11/iteration_planning_note_april_11.mdwn index 57fb826..412465f 100644 --- a/blog/2020/04/11/iteration_planning_note_april_11.mdwn +++ b/blog/2020/04/11/iteration_planning_note_april_11.mdwn @@ -7,7 +7,7 @@ * We've mostly done everything planned for this iteration. This was met with mutual satisfaction. - there's a merge conflict on - [!14](https://gitlab.com/subpplot/subplot/-/merge_requests/14) + [!14](https://gitlab.com/subplot/subplot/-/merge_requests/14) that wasn't resolved before the meeting, but will be done later today, and indeed was done while writing this note. - We sorted out two other merge requests during the meeting. |