11 lines
310 B
Plaintext
11 lines
310 B
Plaintext
Default: <%= data.data.title %>
|
|
Data 1: <%= data.data1.title %>
|
|
Data 2: <%= data.data2.title %>
|
|
<<<<<<< HEAD
|
|
Override in Two: <%= data.two.title %>
|
|
Override in One: <%= data.one.title %>
|
|
=======
|
|
Override in One: <%= data.one.title %>
|
|
Override in Two: <%= data.two.title %>
|
|
>>>>>>> Add external command support
|