Improve merge on update

2018-05-09 15:32:53 -07:00
parent 57355088f0
commit d087da2ce7
8 changed files with 40 additions and 58 deletions
--- a/mobile/src/ui/OptionStrip.js
+++ b/mobile/src/ui/OptionStrip.js
@@ -83,10 +83,9 @@ export class OptionStrip extends Component {
                {
                  flex: 1,
                  justifyContent: "center",
-                  // TODO: Setting specific border widths broken in RN 0.49.  Enable in RN 0.55 and above?
-                  // borderTopWidth: 1,
-                  // borderBottomWidth: 1,
-                  // borderLeftWidth: 1,
+                  borderTopWidth: 1,
+                  borderBottomWidth: 1,
+                  borderLeftWidth: 1,
                  borderColor: "black",
                },
                index === 0 && {