projects
/
pithos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Put back newlines in Conflict responses.
[pithos]
/
pithos
/
settings.py
diff --git
a/pithos/settings.py
b/pithos/settings.py
index
a5304f1
..
61cb325
100644
(file)
--- a/
pithos/settings.py
+++ b/
pithos/settings.py
@@
-1,4
+1,4
@@
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following