diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 21:48:10 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:55:19 +0100 |
| commit | 41136caa3b2b6506238ebf2e11eaf13d023cecdb (patch) | |
| tree | 4297093800b00210d3fdf3db7e4822fc91a3dd45 /base | |
| parent | 3d63b94427bad65061f89b7e621e8f9736462f1c (diff) | |
| download | external_chromium-41136caa3b2b6506238ebf2e11eaf13d023cecdb.zip external_chromium-41136caa3b2b6506238ebf2e11eaf13d023cecdb.tar.gz external_chromium-41136caa3b2b6506238ebf2e11eaf13d023cecdb.tar.bz2 | |
Merge Chromium at 10.0.621.0: Fix conflict in prcpucfg.h
Upstream change where we have a local change.
http://codereview.chromium.org/5479001/
Change-Id: I8fdd7adb4d992e0a03273d76ffde407ef9efb939
Diffstat (limited to 'base')
| -rw-r--r-- | base/third_party/nspr/prcpucfg.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/third_party/nspr/prcpucfg.h b/base/third_party/nspr/prcpucfg.h index 95c2c0a..59e2cdf 100644 --- a/base/third_party/nspr/prcpucfg.h +++ b/base/third_party/nspr/prcpucfg.h @@ -34,11 +34,7 @@ #include "base/third_party/nspr/prcpucfg_win.h" #elif defined(__APPLE__) #include "base/third_party/nspr/prcpucfg_mac.h" -<<<<<<< HEAD -#elif defined(__linux__) || defined(ANDROID) -======= -#elif defined(__linux__) || defined(__native_client__) ->>>>>>> chromium.org at r10.0.621.0 +#elif defined(__linux__) || defined(__native_client__) || defined(ANDROID) #include "base/third_party/nspr/prcpucfg_linux.h" #elif defined(__FreeBSD__) #include "base/third_party/nspr/prcpucfg_freebsd.h" |