blob: 962df8fd46ddc868d389ff8b9b7ac6072b14f3b3 [file] [log] [blame]
view: test {
## Hello team, you are awesome!!
## Paola is awesome since she is reviewing my CL
# adding a merge conflict
## Adding a new line
## Adding another new line
}