Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
135d6034
Commit
135d6034
authored
Jul 14, 2017
by
Matthieu Schaller
Browse files
Removed incorrect merge and diff lines in space.h
parent
951989db
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/space.h
View file @
135d6034
...
...
@@ -43,14 +43,8 @@ struct cell;
#define space_cellallocchunk 1000
#define space_splitsize_default 400
#define space_maxsize_default 8000000
<<<<<<<
HEAD
#define space_subsize_pair_default 256000000
#define space_subsize_self_default 32000
#define space_maxcount_default 10000
=======
#define space_subsize_pair_default 64000000
#define space_subsize_self_default 16000
>>>>>>>
88356221
ae330b1818217a6f4c5ac7890ad02c11
#define space_max_top_level_cells_default 12
#define space_stretch 1.10f
#define space_maxreldx 0.1f
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment