projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Resolving Conflicts ... Still there're errors that should be fixed
[satune.git]
/
src
/
C.cfg
diff --git
a/src/C.cfg
b/src/C.cfg
index 9831cf21c6ddb7019895b14bae4fcfb20016765c..9a4c97a57a3e597afe3bd6847fdcd6be2b241920 100644
(file)
--- a/
src/C.cfg
+++ b/
src/C.cfg
@@
-12,4
+12,4
@@
sp_special_semi = ignore
sp_before_semi = ignore
sp_before_semi_for_empty = ignore
sp_after_semi_for_empty = ignore
-sp_before_nl_cont
= ignore
\ No newline at end of file
+sp_before_nl_cont = ignore
\ No newline at end of file