1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Remove accidental git merge marker [ci skip]

This commit is contained in:
Petrik de Heus 2019-12-25 15:52:02 +01:00 committed by George Claghorn
parent 5e6c331823
commit 1714d4ff86

View file

@ -353,7 +353,6 @@ module Rails
super()
...
>>>>>>> c5102225a36d254dc067c6d5a606856233d46e99
end
private