FYI: Move conflict resolve + clean up afterwards

sync/sessions/session_state.cc

Index: sync/sessions/session_state.cc
diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc
deleted file mode 100644
index a08b093c9e616fc0993e2c72c930f18125bae493..0000000000000000000000000000000000000000
--- a/sync/sessions/session_state.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "sync/sessions/session_state.h"
-
-#include <set>
-#include <vector>
-
-#include "base/memory/scoped_ptr.h"
-#include "base/values.h"
-
-using std::set;
-using std::vector;
-
-namespace syncer {
-namespace sessions {
-
-PerModelSafeGroupState::PerModelSafeGroupState() {
-}
-
-PerModelSafeGroupState::~PerModelSafeGroupState() {
-}
-
-}  // namespace sessions
-}  // namespace syncer