Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(951)

Unified Diff: firmware/version.c

Issue 6334148: Remove version.c (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « firmware/Makefile ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « firmware/Makefile ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698