Commit 32f5904d authored by Daniel Stan's avatar Daniel Stan

Fast forward only

parent 314badd9
......@@ -7,3 +7,7 @@
email = ds@tudo.re
[push]
default = simple
[merge]
ff = false
[pull]
ff = true
......@@ -6,6 +6,7 @@
<body>
<h1>Tudor's webpage</h1>
<ul>
<li><a href="http://www.lsv.ens-cachan.fr/~dstan/defense.php">My PhD Defense</a></li>
<li><a href="http://www.lsv.ens-cachan.fr/~dstan/">Academic page at LSV</a></li>
<li><a href="https://gitlab.crans.org/u/dstan">Gitlab profile (at Crans)</a></li>
</ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment