aboutsummaryrefslogtreecommitdiffstats
path: root/web/nms.gathering.org/old/speedometer/d3-master/.gitattributes
blob: aa9cd050d7d4723e1b5233214162fadef5231ac1 (plain)
1
2
3
4
5
bower.json -diff merge=ours
component.json -diff merge=ours
d3.js -diff merge=ours
d3.min.js -diff merge=ours
package.js -diff merge=ours