Merge branch 'develop' into 'master'

Regular merge of develop See merge request R3.training/git.practice!21

Merge branch 'develop' into 'master'
Regular merge of develop See merge request R3.training/git.practice!21
7cbfcab4 · Laurent Heirendt · 9e1fbef7 · 6b1bb1e8 · 7cbfcab4
Commit 7cbfcab4 authored 6 years ago by Laurent Heirendt
--- a/sqrt_laurent.m
+++ b/sqrt_laurent.m
+function s = sqrt_laurent(a)
+    s = sqrt(a);
+% my comment
+end