Done

2020-06-12 16:45:11 +01:00 · 2020-06-12 16:45:11 +01:00 · 7b59c41453
parent ddc689a335 f0b872e979
commit 7b59c41453
1 changed files with 4 additions and 0 deletions
--- a/conversions/c_atoi_str_to_integer.c
+++ b/conversions/c_atoi_str_to_integer.c
@ -1,7 +1,11 @@
 /**
 * \file
 * \brief Recoding the original atoi function in stdlib.h 
+<<<<<<< HEAD
 * \author [Mohammed YMIK](https://github.com/medymik)
+=======
+ * \author [Medymik](https://github.com/medymik)
+>>>>>>> f0b872e979417f729d986ac0e4cdedb6cc6655d4
 *
 * The function convert a string passed to an integer 
 */