(no commit message)

diff --git a/student/stajnmar/index.mdwn b/student/stajnmar/index.mdwn
index fa94bef187794f13d40bf87a44b77eebe15423f0..5a5d4a5c3a74a2d9e4e84311985a486e7ea66cc9 100644 (file)
--- a/student/stajnmar/index.mdwn
+++ b/student/stajnmar/index.mdwn
@@ -22,11 +22,10 @@ Links to the bugs are listed above.
 
 [Public repository][4] - link to my public repository, fork of C:geo.
 
-
 Links to my commits:
 
- - [link text][5]
-
+ - [#2531][5] - Fixes #2531 - Auto-save now works as expected.
+ - [#2413][6] - Fixes #2413 - In English it is better to use "Login failed: Message from server" since the message from server can be a whole new sentence.
 
 
 Here, I'll add links similar to the examples below and describe what
@@ -59,4 +58,9 @@ For example: <a href='https://www.ohloh.net/accounts/9897?ref=Detailed'>
   [2]: https://github.com/cgeo/c-geo-opensource/issues/2413
   [3]: https://github.com/cgeo/c-geo-opensource/pull/2574
   [4]: https://github.com/marstaj/c-geo-opensource
+<<<<<<< HEAD
   [5]: https://github.com/marstaj/c-geo-opensource/commit/6210c6b48bf27addbc0a4aa404e4bd8093439431
+=======
+  [5]: https://github.com/cgeo/c-geo-opensource/commit/3c4add1feb0954600b9abb3ad7a0fee0122edcb5
+  [6]: https://github.com/marstaj/c-geo-opensource/commit/6210c6b48bf27addbc0a4aa404e4bd8093439431
+>>>>>>> a53ecfaef77244948d5363102f2ebed919a78277