2020-1-capstone-design1 / Triz_Project1

Go to a project
Toggle navigation Toggle navigation pinning
minsung
5438e6e0 1 parent 2b9d9742

test

Inline Side-by-side
Showing 1 changed file with 3 additions and 0 deletions
...@@ -9,6 +9,9 @@ test ...@@ -9,6 +9,9 @@ test
9 test 9 test
10 ======= 10 =======
11 >>>>>>> b2b41f3f62c815cfb25461fd8e958477ff581840 11 >>>>>>> b2b41f3f62c815cfb25461fd8e958477ff581840
12 +<<<<<<< HEAD
12 test 13 test
13 test 14 test
15 +=======
16 +>>>>>>> parent of 0e6bf1f... test
14 test 17 test
......