| Index: firmware/version.c
|
| diff --git a/firmware/version.c b/firmware/version.c
|
| deleted file mode 100644
|
| index 4417692af58b27110e2ccc3098719b15c2d27c8b..0000000000000000000000000000000000000000
|
| --- a/firmware/version.c
|
| +++ /dev/null
|
| @@ -1,9 +0,0 @@
|
| -<<<<<<< HEAD
|
| -char* VbootVersion = "VBOOv=b849a043";
|
| -=======
|
| -<<<<<<< HEAD
|
| -char* VbootVersion = "VBOOv=0a42e63b";
|
| -=======
|
| -char* VbootVersion = "VBOOv=b849a043";
|
| ->>>>>>> Initial version of crossystem. Works for getting switch positions.
|
| ->>>>>>> Initial version of crossystem. Works for getting switch positions.
|
|
|