Repository: cordova-mobile-spec Updated Branches: refs/heads/master 81ec82ead -> f282c5f20
Removed a missed merge line. Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/f282c5f2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/f282c5f2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/f282c5f2 Branch: refs/heads/master Commit: f282c5f20311782f40460c916f40450a1b3d33a0 Parents: 81ec82e Author: Max Woghiren <[email protected]> Authored: Thu Aug 14 17:18:20 2014 -0400 Committer: Max Woghiren <[email protected]> Committed: Thu Aug 14 17:18:20 2014 -0400 ---------------------------------------------------------------------- config.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/f282c5f2/config.xml ---------------------------------------------------------------------- diff --git a/config.xml b/config.xml index 6252ef2..b64fc17 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> <widget id="org.apache.mobilespec" version="0.0.1" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> -<<<<<<< HEAD <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
