Skip to content

Fix Zach's attempt to resolve conflicts #14

Merged
merged 2 commits into from Jul 24, 2014
Commits on Jul 23, 2014
  1. @danielberkompas

    Fix Zach's attempt to resolve conflicts

    danielberkompas committed Jul 23, 2014
    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.
  2. @danielberkompas

    Redo view and CSS changes

    danielberkompas committed Jul 23, 2014
    These didn't make it in with the merge. So, I re-did them.
Something went wrong with that request. Please try again.