79d9b6a Fixed rebase error

Merged and Committed by mjia 6 years ago
    Fixed rebase error
    
        
file modified
+2 -1
file modified
+14 -7
file modified
+1 -1