Browse Source

Pushing the very last changes from last year

master
Graham Northup 2 years ago
parent
commit
5856849227
Signed by untrusted user: grissess GPG Key ID: 5D000E6F539376FB
  1. 8
      src/world/mod.rs

8
src/world/mod.rs

@ -180,7 +180,11 @@ mod test {
#[test]
fn room_align() -> io::Result<()> {
<<<<<<< HEAD
let mut w = World::new(0, Vec::new().into_iter());
=======
let mut w = World::new(0, vec![].into_iter());
>>>>>>> Pushing the very last changes from last year
{
let mut r = w.region_mut();
@ -211,7 +215,11 @@ mod test {
#[test]
fn world_with_entity() -> io::Result<()> {
<<<<<<< HEAD
let mut w = World::new(0, Vec::new().into_iter());
=======
let mut w = World::new(0, vec![].into_iter());
>>>>>>> Pushing the very last changes from last year
{
let mut r = w.region_mut();

Loading…
Cancel
Save