Skip to content

Commit c679b6f

Browse files
author
David Kline (ANALOG)
committed
fix incomplete merge take 2
1 parent 4b30259 commit c679b6f

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,3 @@ help .\build.ps1 -Detailed
105105
```
106106

107107
> Note: If you don't specify `-Version <version>` the script will try to infer it from tags pointing to the current git commit. An error is produced if you don't have a tag and no version is provided.
108-
<<<<<<< HEAD
109-
<<<<<<< HEAD
110-
| See code examples. Do a coding tutorial. Watch guest lectures. | Get design guides. Build user interface. Learn interactions and input. | Get development guides. Learn the technology. Understand the science. | Join open source projects. Ask questions on forums. Attend events and meet-ups. |
111-
=======
112-
>>>>>>> 5e39dc455... Update README.md
113-
=======
114-
| See code examples. Do a coding tutorial. Watch guest lectures. | Get design guides. Build user interface. Learn interactions and input. | Get development guides. Learn the technology. Understand the science. | Join open source projects. Ask questions on forums. Attend events and meet-ups. |
115-
>>>>>>> 4d320ed42... Remove broken hyper link

0 commit comments

Comments
 (0)