| commit | f282c5f20311782f40460c916f40450a1b3d33a0 | [log] [tgz] |
|---|---|---|
| author | Max Woghiren <max.woghiren@gmail.com> | Thu Aug 14 17:18:20 2014 -0400 |
| committer | Max Woghiren <max.woghiren@gmail.com> | Thu Aug 14 17:18:20 2014 -0400 |
| tree | 2c91fcf09b991c96773b6f9d2143154462e4bb8e | |
| parent | 81ec82ead4631e60d9117bdb49eac9e6eafa9bc8 [diff] |
Removed a missed merge line.
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