middleman/middleman-core/fixtures/multiple-data-sources-app/source/index.html.erb

11 lines
310 B
Plaintext
Raw Normal View History

2014-07-16 03:01:45 +02:00
Default: <%= data.data.title %>
Data 1: <%= data.data1.title %>
Data 2: <%= data.data2.title %>
2014-07-11 23:24:22 +02:00
<<<<<<< HEAD
2014-07-16 03:01:45 +02:00
Override in Two: <%= data.two.title %>
2014-07-11 23:24:22 +02:00
Override in One: <%= data.one.title %>
=======
Override in One: <%= data.one.title %>
Override in Two: <%= data.two.title %>
>>>>>>> Add external command support