cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [09/16] git commit: fixed merge conflict
Date Wed, 16 Oct 2013 22:53:02 GMT
fixed merge conflict


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/7b84da62
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/7b84da62
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/7b84da62

Branch: refs/heads/master
Commit: 7b84da62d5017837f71200e569177ab3a7b6e7cc
Parents: 9e3fc87 fecd81a
Author: Steven Gill <stevengill97@gmail.com>
Authored: Tue Oct 15 15:08:25 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Tue Oct 15 15:08:25 2013 -0700

----------------------------------------------------------------------
 src/metadata/windows8_parser.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



Mime
View raw message