projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Clean up merge heuristic to do what we said it did
[satune.git]
/
src
/
config.h
diff --git
a/src/config.h
b/src/config.h
index 5ce22b0f0fdf89a4f2e0e5c6690201aacddd6579..ce13d3c8ef6873db22e29ce7dc5d7e25ef0b1630 100644
(file)
--- a/
src/config.h
+++ b/
src/config.h
@@
-19,7
+19,6
@@
//#define CONFIG_DEBUG
#endif
-
#ifndef CONFIG_ASSERT
#define CONFIG_ASSERT
#endif