Skip to content

Commit

Permalink
Merge branch 'space_helmet' of github.com:talg/Rocket into space_helmet
Browse files Browse the repository at this point in the history
  • Loading branch information
talg committed Sep 24, 2018
2 parents 0706342 + 6670c71 commit d5f607e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/lib/tests/space_helmet.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![cfg_attr(test, feature(plugin, decl_macro, proc_macro_non_items))]
#![cfg_attr(test, plugin(rocket_codegen))]

#[macro_use] extern crate rocket;
extern crate rocket;
extern crate rocket_contrib;

#[cfg(feature = "space_helmet")]
Expand Down
2 changes: 1 addition & 1 deletion examples/space_helmet/src/hello.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![feature(decl_macro, proc_macro_non_items, plugin)]
#![plugin(rocket_codegen)]

#[macro_use] extern crate rocket;
extern crate rocket;
extern crate rocket_contrib;

use rocket::http::uri::Uri;
Expand Down

0 comments on commit d5f607e

Please sign in to comment.