Your IP : 52.14.148.63

Current Path : /home/lentoinv/lentoria.com/.git/
Upload File :
Current File : //home/lentoinv/lentoria.com/.git/MERGE_MSG

Merge branch 'master' of https://github.com/thomasonyemechi/lentoria-frontend

# Conflicts:
#	app/Http/Controllers/helper.php
?>