diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 23:40:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 23:40:05 +0000 |
| commit | 281df63d7c9d112586a6f102f16d4983aa82cd34 (patch) | |
| tree | 908fa819c93507750372f0f9a94b135cc32d47fd /chrome/browser/bookmarks | |
| parent | c411569a16252ab7dcbb3996e302a25946fa15bd (diff) | |
| download | chromium_src-281df63d7c9d112586a6f102f16d4983aa82cd34.zip chromium_src-281df63d7c9d112586a6f102f16d4983aa82cd34.tar.gz chromium_src-281df63d7c9d112586a6f102f16d4983aa82cd34.tar.bz2 | |
Fix merge conflict in bookmark_node_data.h
BUG=BUG=37891
TEST=trybots
TBR=mrossetti@chromium.org
Review URL: http://codereview.chromium.org/5338006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_node_data.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h index 11d8c30..8b8310d 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.h +++ b/chrome/browser/bookmarks/bookmark_node_data.h @@ -163,12 +163,4 @@ struct BookmarkNodeData { FilePath::StringType profile_path_; }; -<<<<<<< HEAD:chrome/browser/bookmarks/bookmark_drag_data.h -======= -// TODO(tfarina): Remove this when we finish renaming all the remaining entries. -// This is a temporary hack, to make it possible to convert all the entries in -// small chunks. See crbug.com/37891 for context. -typedef BookmarkDragData BookmarkNodeData; - ->>>>>>> Fix includes for bookmark_node_data.:chrome/browser/bookmarks/bookmark_node_data.h #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_ |