resolve merge conflicts

2015-02-17 21:30:41 -05:00
parent 3a6e50db99 b99ce3736f
commit 9c71cc6d1f
9 changed files with 139 additions and 38 deletions
--- a/src/Layout.c
+++ b/src/Layout.c
@@ -336,6 +336,7 @@ static float getRelativePosition(css_node_t *node, css_flex_direction_t axis) {

 static void layoutNodeImpl(css_node_t *node, float parentMaxWidth) {
  /** START_GENERATED **/
+
  css_flex_direction_t mainAxis = getFlexDirection(node);
  css_flex_direction_t crossAxis = mainAxis == CSS_FLEX_DIRECTION_ROW ?
    CSS_FLEX_DIRECTION_COLUMN :