Skip to content
Snippets Groups Projects
Commit 135d6034 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Removed incorrect merge and diff lines in space.h

parent 951989db
Branches
Tags
1 merge request!365Subsize
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 6 deletions
src/space.h
+ 0
− 6
View file @ 135d6034
...@@ -43,14 +43,8 @@ struct cell; ...@@ -43,14 +43,8 @@ struct cell;
#define space_cellallocchunk 1000 #define space_cellallocchunk 1000
#define space_splitsize_default 400 #define space_splitsize_default 400
#define space_maxsize_default 8000000 #define space_maxsize_default 8000000
<<<<<<< HEAD
#define space_subsize_pair_default 256000000 #define space_subsize_pair_default 256000000
#define space_subsize_self_default 32000 #define space_subsize_self_default 32000
#define space_maxcount_default 10000
=======
#define space_subsize_pair_default 64000000
#define space_subsize_self_default 16000
>>>>>>> 88356221ae330b1818217a6f4c5ac7890ad02c11
#define space_max_top_level_cells_default 12 #define space_max_top_level_cells_default 12
#define space_stretch 1.10f #define space_stretch 1.10f
#define space_maxreldx 0.1f #define space_maxreldx 0.1f
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment