| Index: chrome/browser/chromeos/login/wizard_controller.cc | 
| =================================================================== | 
| --- chrome/browser/chromeos/login/wizard_controller.cc	(revision 131599) | 
| +++ chrome/browser/chromeos/login/wizard_controller.cc	(working copy) | 
| @@ -50,7 +50,7 @@ | 
| #include "ui/base/l10n/l10n_util.h" | 
|  | 
| #if defined(USE_LINUX_BREAKPAD) | 
| -#include "chrome/app/breakpad_linuxish.h" | 
| +#include "chrome/app/breakpad_linux.h" | 
| #endif | 
|  | 
| using content::BrowserThread; | 
|  | 
| Property changes on: chrome/browser/chromeos/login/wizard_controller.cc | 
| ___________________________________________________________________ | 
| Deleted: svn:mergeinfo | 
|  | 
|  |