opendev
/
sandbox
Code Issues Proposed changes

Merge conflict test 

Is it happening locally or externally?

Change-Id: I1e6324ae5c099bec3b6f6ddadb6da62787c38e14
This commit is contained in:
Joshua Padman 2017-12-06 20:55:29 +11:00
parent 1a72489efc
commit 6bc4e165a3
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aa
View File

@ -1 +1,2 @@
asdfasf
This file doesn't exist yet.