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

r882:d869b56a default
r1345:b48f493b default
Show More
rhodecode-favicon.html
7 lines | 214 B | text/html | HtmlLexer
favicon: added favicon notifications
r882 <link rel="import" href="../../../../../../bower_components/polymer/polymer.html">
<dom-module id="rhodecode-favicon">
<template>
</template>
<script src="rhodecode-favicon.js"></script>
</dom-module>