Skip to content

Commit

Permalink
fix: #1392 Merge master and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
nphivu414 committed May 28, 2020
2 parents 18e598a + 1109cc4 commit 0017244
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 90 deletions.
2 changes: 1 addition & 1 deletion packages/cognito-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@reapit/cognito-auth",
"version": "2.1.5",
"version": "2.1.6",
"description": "Simple wrapper around AWS Cognito for basic authentication flow",
"keywords": [],
"homepage": "https://github.com/reapit/foundations#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/cognito-auth/src/tests/badges/badge-lines.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions packages/elements/.storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
<script src="https://reapit-demo-site.s3.eu-west-2.amazonaws.com/scripts/search-widget.js"></script>
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet" />

This file was deleted.

This file was deleted.

37 changes: 0 additions & 37 deletions packages/elements/src/components/SearchComponent/index.stories.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions packages/elements/src/components/SearchComponent/index.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion packages/marketplace/src/tests/badges/badge-branches.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/marketplace/src/tests/badges/badge-functions.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/marketplace/src/tests/badges/badge-lines.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/marketplace/src/tests/badges/badge-statements.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0017244

Please sign in to comment.