Merge conflicts fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/cffcc3da Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/cffcc3da Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/cffcc3da Branch: refs/heads/ian_taverna_server Commit: cffcc3da648da67ddba79ac42d3f6021b939bdf8 Parents: 825c79b d14f853 Author: Ian Dunlop <[email protected]> Authored: Wed Jan 11 16:01:56 2017 +0000 Committer: Ian Dunlop <[email protected]> Committed: Wed Jan 11 16:01:56 2017 +0000 ---------------------------------------------------------------------- .../mobile/ui/adapter/WorkflowAdapter.java | 18 ++-- .../mobile/ui/workflow/WorkflowFragment.java | 96 ++++++++++++++++++-- app/src/main/res/values/strings.xml | 3 +- app/src/main/res/xml/searchable.xml | 7 +- 4 files changed, 101 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/cffcc3da/app/src/main/res/values/strings.xml ---------------------------------------------------------------------- diff --cc app/src/main/res/values/strings.xml index 20f7c43,3b1a0e5..ae16fca --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@@ -213,6 -212,6 +213,7 @@@ limitations under the License <string name="title_nav_about">About</string> <string name="title_nav_my_workflows">My Workflows</string> <string name="title_nav_os_licences">Licence info</string> + <string name="header_taverna_server_inputs">Workflow Inputs</string> - <!-- Strings related to Settings --> + <!-- Strings related to message --> + <string name="msg_no_workflow_found">No matching criteria workflow found</string> </resources>
