Bryan Housel 2deadd5d6c Fix merge issues

2018-12-19 17:12:06 -05:00

..

actions

Add index property to cloned object, not actual member object

2018-12-12 02:07:03 -05:00

behavior

added basics to sidebar

2018-12-19 13:35:26 -05:00

core

added basics to sidebar

2018-12-19 13:35:26 -05:00

geo

Expand sidebar when selecting notes and data

2018-11-07 09:54:54 -05:00

modes

Fix merge issues

2018-12-19 17:12:06 -05:00

operations

Cleanups to Detach Node feature

2018-07-23 13:36:34 -04:00

osm

WIP: identifying variables in errors

2018-12-19 13:38:40 -05:00

presets

Drop extra whitespace, make sure service exists before using it

2018-12-18 15:38:53 -05:00

renderer

Fix merge issues

2018-12-19 17:12:06 -05:00

services

added: notes and todos for keepRight

2018-12-19 13:45:34 -05:00

svg

Fix merge issues

2018-12-19 17:12:06 -05:00

ui

Fix merge issues

2018-12-19 17:12:06 -05:00

util

Fix merge issues

2018-12-19 17:12:06 -05:00

validations

Drop extra whitespace, make sure service exists before using it

2018-12-18 15:38:53 -05:00

id.js

…

index.js

Move lib/d3.combobox.js -> ui/combobox.js

2018-12-10 12:38:21 -05:00