git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a48129 f218f2d)
fix merge problem
authorsmbaker <smbaker@fc8clean.lan>
Mon, 28 Nov 2011 03:06:16 +0000 (19:06 -0800)
committersmbaker <smbaker@fc8clean.lan>
Mon, 28 Nov 2011 03:06:16 +0000 (19:06 -0800)
1  2 
sfa/client/sfi.py patch | diff1 | diff2 | blob | history

diff --cc sfa/client/sfi.py
index 64bc550,6299ce2..6299ce2
mode 100755,100755..100644
--- 1/sfa/client/sfi.py
--- 2/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
sfa