merge conflicts while deleting *.class *.dex *.apk to .git/info/exclude cleaner
authorarulmozhi <arulmozhi@koparakesari.(none)>
Fri, 30 Nov 2012 15:44:05 +0000 (21:14 +0530)
committerarulmozhi <arulmozhi@koparakesari.(none)>
Fri, 30 Nov 2012 15:44:05 +0000 (21:14 +0530)
commitd6fcb9f52b06d782bfb3a3d410cf4ab16f7189d4
tree22fbedc3ae6fb3e858d18922d587fcc2af4a552a
parente86f62bf505f5754d1a6b4c6e684e5ff6cbc81fa
parent26af874ac0f70dc427c0c48fefc54889819b17a3
merge conflicts while deleting *.class *.dex *.apk to .git/info/exclude
MsgScreener/res/layout/activity_main.xml