berkompasacademy/omnicorp_project — pull request #14 by danielberkompas (2014-07-23 23:12:58+00:00)
Title: Fix Zach's attempt to resolve conflicts

You should have removed this stuff, since we don't want it. The conflict
was this:

- You/Matthew added stuff to the home_page.css file. Some of these
things included `#container` styles we didn't need.
- At the same time, I removed the container styles.

Git marked this conflict for you this way:

```
<<<<<<<<<< HEAD
(my changes, empty because I removed everything)
===============
(Your stuff)
>>>>>>>>>> master
```

When you resolved the conflict, you should have removed the whole block,
since my change was to get rid of it all.

Hopefully that makes sense.