tests result

diff --git a/student/stankmic/index.mdwn b/student/stankmic/index.mdwn
index 35e87bd8b270f93f32902a5bb9bcee7203cfddbb..8b774c613c4e5a4f64efdfcb132a06c6c0cabaa8 100644 (file)
--- a/student/stankmic/index.mdwn
+++ b/student/stankmic/index.mdwn
@@ -12,7 +12,11 @@ Links documenting the results of my work
 
 * [Communication in BMO](https://bugzilla.mozilla.org/show_bug.cgi?id=1206139) (+ verification in prod)
 * [Repo before my commit](https://github.com/mozilla/kitsune/tree/1bf0fbf2ae799ecba3e05ec93bf0b655e67b4566)
+<<<<<<< HEAD
 * [Accepted PR](https://github.com/mozilla/kitsune/pull/2793) ([tests run](https://travis-ci.org/mozilla/kitsune/builds/111495847))
+=======
+* [Accepted PR](https://github.com/mozilla/kitsune/pull/2793) ([tests result](https://travis-ci.org/mozilla/kitsune/builds/111495847))
+>>>>>>> 0358b25338b99aa5c2cf5c7808b2b137e49a3805
 * [Patch](https://github.com/mozilla/kitsune/commit/a6731deca604c0aeec012413797cef27ba256524)
 
 Presentation