test: correct snapshot

callstack · Oct 16, 2023 · 434e6da · 434e6da
1 parent 9197c9b
commit 434e6da
Showing 1 changed file with 0 additions and 77 deletions.
diff --git a/src/components/__tests__/__snapshots__/DataTable.test.tsx.snap b/src/components/__tests__/__snapshots__/DataTable.test.tsx.snap
@@ -2750,84 +2750,7 @@ exports[`DataTable.Title renders data table title with sort icon 1`] = `
 </View>
 `;
 
-<<<<<<< HEAD
 exports[`DataTable.Title renders right aligned data table title 1`] = `
-=======
-exports[`renders right aligned data table cell 1`] = `
-<View
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": true,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={true}
-  onBlur={[Function]}
-  onClick={[Function]}
-  onFocus={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    [
-      false,
-      [
-        {
-          "alignItems": "center",
-          "flex": 1,
-          "flexDirection": "row",
-        },
-        {
-          "justifyContent": "flex-end",
-        },
-        undefined,
-      ],
-    ]
-  }
->
-  <Text
-    numberOfLines={1}
-    style={
-      [
-        {
-          "textAlign": "left",
-        },
-        {
-          "color": "rgba(28, 27, 31, 1)",
-          "fontFamily": "System",
-          "fontWeight": "400",
-          "letterSpacing": 0,
-        },
-        {
-          "writingDirection": "ltr",
-        },
-        undefined,
-      ]
-    }
-  >
-    356
-  </Text>
-</View>
-`;
-
-exports[`renders right aligned data table title 1`] = `
->>>>>>> adef2260 (refactor: add prop description and default values)
 <View
   accessibilityState={
     {