diff --git a/views/edit_profile.php b/views/edit_profile.php
index b718ced7373e83be48413fd57344c5076c9887d4..281b9a7d1c40d93ceae1a8832023ac0ded00477e 100644
--- a/views/edit_profile.php
+++ b/views/edit_profile.php
@@ -72,9 +72,3 @@ if (isset($_COOKIE['access_token'])) {
 
 </div>
 </body>
-=======
- * User: secret
- * Date: 21/10/18
- * Time: 17:49
- */
->>>>>>> Stashed changes