From 3904138c20891e85dbc5a5d808ebba171eb2816b Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Wed, 14 Mar 2018 02:41:55 +0000
Subject: [PATCH] Remove merge artifact.

---
 artiq/firmware/bootloader/Cargo.toml | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 artiq/firmware/bootloader/Cargo.toml

diff --git a/artiq/firmware/bootloader/Cargo.toml b/artiq/firmware/bootloader/Cargo.toml
deleted file mode 100644
index 506a56a9b..000000000
--- a/artiq/firmware/bootloader/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["M-Labs"]
-name = "bootloader"
-version = "0.0.0"
-build = "build.rs"
-
-[lib]
-name = "bootloader"
-crate-type = ["staticlib"]
-path = "main.rs"
-
-[build-dependencies]
-build_misoc = { path = "../libbuild_misoc" }
-
-[dependencies]
-byteorder = { version = "1.0", default-features = false }
-crc = { version = "1.7", default-features = false }
-board = { path = "../libboard", features = ["uart_console", "smoltcp"] }
-
-[dependencies.smoltcp]
-git = "https://github.com/m-labs/smoltcp"
-rev = "181083f"
-default-features = false
-features = ["proto-ipv4", "socket-tcp"]