Skip to content

Commit f6b5d72

Browse files
committed
[BPK-2599]: Backpackify
1 parent f56ebba commit f6b5d72

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

packages/react-scripts/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
"babel-loader": "8.1.0",
3434
"babel-plugin-named-asset-import": "^0.3.6",
3535
"babel-preset-react-app": "^9.1.2",
36+
<<<<<<< HEAD
3637
"bpk-mixins": "^20.1.5",
38+
=======
39+
"bpk-mixins": "^19.1.20",
40+
>>>>>>> 1904fcb0 ([BPK-2599]: Backpackify)
3741
"camelcase": "^5.3.1",
3842
"case-sensitive-paths-webpack-plugin": "2.3.0",
3943
"css-loader": "3.4.2",

0 commit comments

Comments
 (0)