Fixing removed newlines

src/gc-debug.c

@@ -1,4 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
+
 #ifndef MMTK_GC
 #include "gc-common.h"
 #include "gc-stock.h"

src/gc-heap-snapshot.cpp

@@ -1,4 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
+
 #include "gc-heap-snapshot.h"
 
 #include "julia.h"

src/gc-page-profiler.c

@@ -1,4 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
+
 #ifndef MMTK_GC
 #include "gc-page-profiler.h"
 #include "julia.h"

src/gc-pages.c

@@ -1,4 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
+
 #ifndef MMTK_GC
 #include "gc-common.h"
 #include "gc-stock.h"

src/gc-stock.c

@@ -1,4 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
+
 #ifndef MMTK_GC
 #include "gc-common.h"
 #include "gc-stock.h"
@@ -405,6 +406,7 @@ static void sweep_weak_refs(void)
     }
 }
 
+
 STATIC_INLINE void jl_batch_accum_heap_size(jl_ptls_t ptls, uint64_t sz) JL_NOTSAFEPOINT
 {
     uint64_t alloc_acc = jl_atomic_load_relaxed(&ptls->gc_tls.gc_num.alloc_acc) + sz;
@@ -452,6 +454,7 @@ STATIC_INLINE jl_value_t *jl_gc_big_alloc_inner(jl_ptls_t ptls, size_t sz)
     return jl_valueof(&v->header);
 }
 
+
 // Instrumented version of jl_gc_big_alloc_inner, called into by LLVM-generated code.
 JL_DLLEXPORT jl_value_t *jl_gc_big_alloc(jl_ptls_t ptls, size_t sz, jl_value_t *type)
 {
@@ -3886,13 +3889,17 @@ JL_DLLEXPORT size_t jl_gc_external_obj_hdr_size(void)
     return sizeof(bigval_t);
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 
 <<<<<<< HEAD
 =======
 >>>>>>> c48a701f54 (WIP: Adding support for MMTk/Immix)
 =======
 >>>>>>> 0aee3ba32a (Refactoring to be considered before adding MMTk)
+=======
+
+>>>>>>> 30ac6f081d (Fixing removed newlines)
 JL_DLLEXPORT void jl_gc_schedule_foreign_sweepfunc(jl_ptls_t ptls, jl_value_t *obj)
 {
     arraylist_push(&ptls->gc_tls.sweep_objs, obj);