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/java/src/com/facebook/csslayout/LayoutEngine.java
+++ b/src/java/src/com/facebook/csslayout/LayoutEngine.java
@@ -283,6 +283,7 @@ public class LayoutEngine {

    /** START_GENERATED **/
  
+  
    CSSFlexDirection mainAxis = getFlexDirection(node);
    CSSFlexDirection crossAxis = mainAxis == CSSFlexDirection.ROW ?
      CSSFlexDirection.COLUMN :