diff options
| author | Monika Hedman <monika_hedman@brown.edu> | 2019-02-25 18:59:15 -0500 |
|---|---|---|
| committer | Monika Hedman <monika_hedman@brown.edu> | 2019-02-25 18:59:15 -0500 |
| commit | 7355089662c5cfd3cde73be50211400b8d5cdd59 (patch) | |
| tree | 7845d6ee25e3dbfebeeb40c17a10ffb556d2472b | |
| parent | 293532a50a5670d2cd04fed65df77173e2dbad67 (diff) | |
merging 2
| -rw-r--r-- | package-lock.json | 8 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionView.tsx | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/package-lock.json b/package-lock.json index d80d5c4f9..4f6be9f69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -147,8 +147,6 @@ "integrity": "sha512-LusnB0YhTXpBT25PXyGPQlK7leE1e41Vezq1hHEUwjfkopM1Pkv2X2Ppxqh9c+w/HZ6Udzki8AJotKNjDTGdkQ==", "requires": { "express-validator": "*" -<<<<<<< HEAD -======= } }, "@types/form-data": { @@ -157,7 +155,6 @@ "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", "requires": { "@types/node": "*" ->>>>>>> 292ff1a8d75f8b15f9388d2c577e09a13836d5dc } }, "@types/jquery": { @@ -381,8 +378,6 @@ "integrity": "sha512-XiYCcn/CBajrj18vLA3kO79AHr5yZTCJe2kl87ZNTRxLO14y9D0IGeGZ3xLsqhfYrJSkkVzAJV8v+bQ4nuKCRQ==", "requires": { "@types/react": "*" -<<<<<<< HEAD -======= } }, "@types/request": { @@ -394,7 +389,6 @@ "@types/form-data": "*", "@types/node": "*", "@types/tough-cookie": "*" ->>>>>>> 292ff1a8d75f8b15f9388d2c577e09a13836d5dc } }, "@types/serve-static": { @@ -13349,4 +13343,4 @@ "dev": true } } -} +}
\ No newline at end of file diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx index 99f76decf..03e1f1fa4 100644 --- a/src/client/views/collections/CollectionView.tsx +++ b/src/client/views/collections/CollectionView.tsx @@ -29,11 +29,7 @@ export class CollectionView extends React.Component<CollectionViewProps> { public static LayoutString(fieldKey: string = "DataKey") { return `<CollectionView Document={Document} -<<<<<<< HEAD - ScreenToLocalTransform={ScreenToLocalTransform} fieldKey={${fieldKey}} isSelected={isSelected} select={select} bindings={bindings} documentSize={documentSize} -======= ScreenToLocalTransform={ScreenToLocalTransform} fieldKey={${fieldKey}} panelWidth={PanelWidth} panelHeight={PanelHeight} isSelected={isSelected} select={select} bindings={bindings} ->>>>>>> 292ff1a8d75f8b15f9388d2c577e09a13836d5dc isTopMost={isTopMost} BackgroundView={BackgroundView} />`; } public active = () => { |