Skip to content

Commit 067be23

Browse files
aviv1ron1aviv1ron1
committed
test commit conflicts
Signed-off-by: aviv ron <rona@il.ibm.com> Signed-off-by: Aviv Ron <rona@il.ibm.com> Signed-off-by: aviv ron <rona@il.ibm.com>
1 parent 6761399 commit 067be23

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,5 @@ Granite Switch was started by IBM Research and is developed in the open. We welc
154154

155155
Apache-2.0 — see [LICENSE](LICENSE).
156156

157-
## conflict!!!!
157+
## test bla bla bla
158+
test test

0 commit comments

Comments
 (0)