##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r1:854a839a default
r5546:50cf7822 merge v5.2.0 stable
Show More
git_diff_chmod.diff
3 lines | 77 B | text/x-diff | DiffLexer
diff --git a/work-horus.xls b/work-horus.xls
old mode 100644
new mode 100755