Fix style

Author: malbarbo

src/unix/notbsd/linux/other/b64/aarch64.rs

@@ -487,7 +487,6 @@ pub const TIOCSWINSZ: ::c_ulong = 0x5414;
 pub const FIONREAD: ::c_ulong = 0x541B;
 
 // Syscall table
-<<<<<<< HEAD
 pub const SYS_io_setup: ::c_ulong = 0;
 pub const SYS_io_destroy: ::c_ulong = 1;
 pub const SYS_io_submit: ::c_ulong = 2;

src/unix/notbsd/linux/other/b64/powerpc64.rs

@@ -484,7 +484,6 @@ pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
 pub const FIONREAD: ::c_ulong = 0x4004667f;
 
 // Syscall table
-<<<<<<< HEAD
 pub const SYS_restart_syscall: ::c_ulong = 0;
 pub const SYS_exit: ::c_ulong = 1;
 pub const SYS_fork: ::c_ulong = 2;

src/unix/notbsd/linux/other/mod.rs

@@ -44,7 +44,8 @@ s! {
 
         #[cfg(any(target_arch = "aarch64",
                   target_arch = "sparc64",
-                  all(target_pointer_width = "32", not(target_arch = "x86_64"))))]
+                  all(target_pointer_width = "32",
+                      not(target_arch = "x86_64"))))]
         pub ut_session: ::c_long,
         #[cfg(any(target_arch = "aarch64",
                   target_arch = "sparc64",
@@ -53,7 +54,8 @@ s! {
 
         #[cfg(not(any(target_arch = "aarch64",
                       target_arch = "sparc64",
-                      all(target_pointer_width = "32", not(target_arch = "x86_64")))))]
+                      all(target_pointer_width = "32",
+                          not(target_arch = "x86_64")))))]
         pub ut_session: ::int32_t,
         #[cfg(not(any(target_arch = "aarch64",
                       target_arch = "sparc64",