lib/gitlab/diff/inline_diff_marker.rb · 3e99123095b26988de67a94b0e7a5207c1ef5ae2 · Kirill Smelkov / gitlab-ce · GitLab

Find file Blame History Permalink

Fix merge conflicts - squashed commit · 3e991230
James Lopez authored Jun 03, 2016
```
# Conflicts:
#	app/models/project.rb
```
3e991230