index

# On branch dev-3.20
# You have unmerged paths.
#   (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#	modified:   applications/callflow/src/cf_route_win.erl
#	modified:   applications/crossbar/Makefile
#	modified:   applications/crossbar/priv/couchdb/account/search.json
#	new file:   applications/crossbar/priv/couchdb/views/globals_resources.json
#	modified:   applications/crossbar/src/crossbar.hrl
#	new file:   applications/crossbar/src/modules/cb_invoices.erl
#	new file:   applications/crossbar/src/modules/cb_show_modified.erl
#	new file:   applications/crossbar/src/modules/cb_subscriptions.erl
#	modified:   applications/ecallmgr/src/ecallmgr.hrl
#	modified:   applications/notify/priv/notify_port_cancel.config
#	modified:   applications/notify/priv/notify_port_request.config
#	modified:   applications/teletype/priv/preview_data/port_request.json
#	new file:   core/camel-1.0.0/Makefile
#	new file:   core/camel-1.0.0/ebin/.placeholder
#	new file:   core/camel-1.0.0/include/camel.hrl
#	new file:   core/camel-1.0.0/src/camel.app.src
#	new file:   core/camel-1.0.0/src/camel_app.erl
#	new file:   core/camel-1.0.0/src/camel_cdr.erl
#	new file:   core/camel-1.0.0/src/camel_invoice.erl
#	new file:   core/camel-1.0.0/src/camel_request.erl
#	new file:   core/camel-1.0.0/src/camel_subscription.erl
#	new file:   core/camel-1.0.0/src/camel_sup.erl
#	new file:   core/camel-1.0.0/src/camel_util.erl
#
# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#	both modified:   applications/crossbar/src/modules/cb_cdrs.erl
#	both modified:   applications/crossbar/src/modules/cb_clicktocall.erl
#	both modified:   core/whistle-1.0.0/src/api/wapi_notifications.erl
#	both modified:   core/whistle_number_manager-1.0.0/src/wh_port_request.erl
#