Common folder housekeeping part 1.

common/git/git_resolve_conflict_handler.cpp

@@ -28,12 +28,14 @@ GIT_RESOLVE_CONFLICT_HANDLER::GIT_RESOLVE_CONFLICT_HANDLER( git_repository* aRep
     m_repository = aRepository;
 }
 
+
 GIT_RESOLVE_CONFLICT_HANDLER::~GIT_RESOLVE_CONFLICT_HANDLER()
 {
 }
 
+
 bool GIT_RESOLVE_CONFLICT_HANDLER::PerformResolveConflict()
 {
-        return true;
+    return true;
 }