diff options
author | Ivan Chen <ivan@tagg.id> | 2021-01-27 17:18:01 -0500 |
---|---|---|
committer | Ivan Chen <ivan@tagg.id> | 2021-01-27 17:18:01 -0500 |
commit | fa589628285602136542b3f8944297dea34ddbf6 (patch) | |
tree | a643a1790d7bff35ea911341c59f5fbd7ab1f068 /src | |
parent | ff3d1e51a1f9d175cfe460e6a16497a6226f450f (diff) | |
parent | 21a3e000443c5c4ab2ae91000108b9d3b0383964 (diff) |
Merge branch 'master' into tma568-delete-comments
# Conflicts:
# src/components/comments/AddComment.tsx
# src/components/comments/CommentTile.tsx
# src/components/comments/CommentsContainer.tsx
# src/services/CommentService.ts
Diffstat (limited to 'src')
-rw-r--r-- | src/constants/strings.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/constants/strings.ts b/src/constants/strings.ts index d3c81622..b0886513 100644 --- a/src/constants/strings.ts +++ b/src/constants/strings.ts @@ -1,3 +1,4 @@ + /* eslint-disable */ // Below is the regex to convert this into a csv for the Google Sheet // export const (.*) = .*?(['|"|`])(.*)\2; |