Skip to content

fix: Remove stray merge markers #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibgreen merged 1 commit into from
Jul 8, 2025
Merged

fix: Remove stray merge markers #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/editable-layers/src/editable-layers/editable-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {Position} from '../utils/geojson-types';
const EVENT_TYPES = ['click', 'pointermove', 'panstart', 'panmove', 'panend', 'keyup'];

// TODO(v9): remove generic layer
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export type EditableLayerProps<DataType = any> = CompositeLayerProps & {
pickingRadius?: number;
pickingDepth?: number;
Expand Down
1 change: 1 addition & 0 deletions modules/editable-layers/src/editable-layers/selection-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const MODE_CONFIG_MAP = {
[SELECTION_TYPE.RECTANGLE]: {dragToDraw: true}
};

// eslint-disable-next-line @typescript-eslint/no-unused-vars
interface SelectionLayerProps<DataT> extends CompositeLayerProps {
layerIds: any[];
onSelect: (info: any) => any;
Expand Down
4 changes: 0 additions & 4 deletions modules/infovis-layers/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
Copyright (c) 2015 - 2021 Uber Technologies, Inc.
>>>>>>> feat(geo-layers): New geo-layers module, unbreak website
Copyright (c) 2022 - 2025 vis.gl contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
4 changes: 0 additions & 4 deletions website/src/docs-sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@

const layerDocs = require('../../docs/modules/layers/sidebar.json');

<<<<<<< HEAD
const infovisLayerDocs = require('../../docs/modules/infovis-layers/sidebar.json');
=======
// const infovisLayerDocs = require('../../docs/modules/infovis-layers/sidebar.json');
>>>>>>> feat(geo-layers): New geo-layers module, unbreak website
const graphLayerDocs = require('../../docs/modules/graph-layers/sidebar.json');
const editableLayerDocs = require('../../docs/modules/editable-layers/sidebar.json');
const arrowLayerDocs = require('../../docs/modules/arrow-layers/sidebar.json');
Expand Down
Loading