Improve codestyle concistancy

Author: Uthedris

examples/raspberrypi/rp2xxx/src/allocator.zig

@@ -39,7 +39,7 @@ const baud_rate = 115200;
 pub const microzig_options = microzig.Options{
     .log_level = .debug,
     //.logFn      = hal.uart.logFn,
-    .logFn = hal.uart.logFnThreadsafe,
+    .logFn = hal.uart.log_threadsafe,
 };
 
 pub fn main() !void {

port/raspberrypi/rp2xxx/src/hal/uart.zig

@@ -490,18 +490,9 @@ pub fn log(
 
 var log_mutex: microzig.hal.mutex.Mutex = .{};
 
-<<<<<<< HEAD
 /// This log function wraps `log` in a semaphore so that calls to it from
 /// different cores or interrupts don't collide.
 pub fn log_threadsafe(
-=======
-/// This log function wraps logFn in a mutex so that calls to it from
-/// different cores or interrupts don't collide.
-///
-/// It is NOT safe to use in code that could be suspended on one core and
-/// resumed on another.
-pub fn logFnThreadsafe(
->>>>>>> 320a0b8 (Significant improvement)
     comptime level: std.log.Level,
     comptime scope: @TypeOf(.EnumLiteral),
     comptime format: []const u8,