Rename references to "join" or "union" to "choice type"

Author: brandonc

request.go

@@ -419,7 +419,15 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)
 			// struct type field.
 			var choiceMapping map[string]structFieldIndex = nil
 			if annotation == annotationPolyRelation {
+<<<<<<< HEAD
 				choiceMapping = choiceStructMapping(fieldValue.Type())
+=======
+				choiceMapping, err = choiceStructMapping(fieldValue.Type())
+				if err != nil {
+					er = err
+					break
+				}
+>>>>>>> 4b13373 (Rename references to "join" or "union" to "choice type")
 			}
 
 			if isSlice {