##// END OF EJS Templates
merge-logic: improve merge failed because of conflicts message.
merge-logic: improve merge failed because of conflicts message.

File last commit:

r927:e470191e default
r1345:b48f493b default
Show More
rcicons.woff
0 lines | 5.8 KiB | application/x-font-woff | TextLexer
/ rhodecode / public / fonts / RCIcons / rcicons.woff
Binary file (application/x-font-woff)