Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

conflict resolved, yeilding

  • Loading branch information...
commit 441f8541ef4e1feb3117c4e59a1a2d08270b22d6 1 parent 53cb492
@maandree authored
Showing with 1 addition and 3 deletions.
  1. +1 −3 drivers/tty/vt/vt.c
View
4 drivers/tty/vt/vt.c
@@ -3006,7 +3006,6 @@ static void vc_init(VCData vc, unsigned int rows, unsigned int cols, int do_clea
static int __init con_init(void)
{
-<<<<<<< HEAD
const String display_desc = NULL;
struct VCData vc;
unsigned int currcons = 0, i;
@@ -3018,7 +3017,7 @@ static int __init con_init(void)
if (!display_desc)
{
fg_console = 0;
-=======
+
const char *display_desc = NULL;
struct vc_data *vc;
unsigned int currcons = 0, i;
@@ -3075,7 +3074,6 @@ static int __init con_init(void)
display_desc, vc->vc_cols, vc->vc_rows);
printable = 1;
->>>>>>> 4e25651b70b8d6ded7229ead8181619e121b648d
console_unlock();
return 0;
}
Please sign in to comment.
Something went wrong with that request. Please try again.