sync/engine/conflict_resolver.h - Issue 10700154: Remove #pragma once from sync

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/engine/conflict_resolver.h

Issue 10700154: Remove #pragma once from sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sync/engine/conflict_resolver.h

diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h

index e0fce1d8ce2d978153ea036d4e6fafd7e643cf5c..2efb1e94fa8540f348c0234f295b0926ddd294c0 100644

--- a/sync/engine/conflict_resolver.h

+++ b/sync/engine/conflict_resolver.h

@@ -7,7 +7,6 @@

#ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_

#define SYNC_ENGINE_CONFLICT_RESOLVER_H_

-#pragma once

#include <map>

#include <set>

« no previous file with comments | « sync/engine/commit.h ('k') | sync/engine/download_updates_command.h » ('j') | no next file with comments »