summaryrefslogblamecommitdiffstats
path: root/images/conflicts.png
blob: f8d0dafd87f3dbc5d2779ce481e3102883516e06 (plain) (tree)
1
2
     






























                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     
�PNG