Merge branch 'development' into #67-make-moment-optional

michaelwittwer · michaelwittwer · commit 40bbdad587d3 · 2018-11-28T10:06:10.000+01:00
# Conflicts:
#	package.json
diff --git a/src/dynamo/expression/param-util.ts b/src/dynamo/expression/param-util.ts
@@ -13,7 +13,6 @@ export function addUpdateExpression(updateExpression: Expression, params: Update
   addExpression('UpdateExpression', updateExpression, params)
 }
 
-// FIXME: name conflicts are not resolved yet (eg. when condition uses same property as update)
 export function addExpression(
   expressionType: 'ConditionExpression' | 'KeyConditionExpression' | 'FilterExpression' | 'UpdateExpression',
   condition: Expression,

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ export function addUpdateExpression(updateExpression: Expression, params: Update`
`13`	`13`	`addExpression('UpdateExpression', updateExpression, params)`
`14`	`14`	`}`
`15`	`15`
`16`		`-// FIXME: name conflicts are not resolved yet (eg. when condition uses same property as update)`
`17`	`16`	`export function addExpression(`
`18`	`17`	`expressionType: 'ConditionExpression' \| 'KeyConditionExpression' \| 'FilterExpression' \| 'UpdateExpression',`
`19`	`18`	`condition: Expression,`