+dev

64d0841c · 9755 · bf18f4be · c6387af8 · 64d0841c
Commit 64d0841c authored Oct 09, 2018 by 9755
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

readme readme +5 -1

No files found.
--- a/readme
+++ b/readme
-readme +dev
+<<<<<<< HEAD
\ No newline at end of file
+readme +dev
+=======
+readme ...this is a test about dev
+>>>>>>> c6387af8e28e3decd75dbd4cd7a8be4d2f5ea733