Update file.cpp
authorJean-Paul Mari <1195657+djipi@users.noreply.github.com>
Thu, 7 Sep 2017 04:56:11 +0000 (00:56 -0400)
committerGitHub <noreply@github.com>
Thu, 7 Sep 2017 04:56:11 +0000 (00:56 -0400)
commita59e9035304af5355e1c474cf02c9bdb8740615c
treec2d5633a0e4a7700a738b197dd53dfa0413b5af5
parent305a149530f8397c744a3c47872195362acc5db8
Update file.cpp

To fix the conflicts
src/file.cpp