##// 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:

r1:854a839a default
r1345:b48f493b default
Show More
ProximaNova-Regular.woff
0 lines | 22.4 KiB | application/x-font-woff | TextLexer
/ rhodecode / public / fonts / ProximaNova / ProximaNova-Regular.woff
Binary file (application/x-font-woff)