Permalink
Browse files

fix last merge

  • Loading branch information...
1 parent 776a0c3 commit 49878e87ff551de0b21cff9950079a5e8c668164 @muromec committed Aug 21, 2011
Showing with 0 additions and 1 deletion.
  1. +0 −1 arch/arm/mach-tegra/board-seaboard-panel.c
@@ -627,7 +627,6 @@ int __init asymptote_panel_init(void)
}
#endif
-<<<<<<< HEAD
#ifdef CONFIG_MACH_PICASSO
int __init picasso_panel_init(void)
{

0 comments on commit 49878e8

Please sign in to comment.