removing unwanted files from wrong merge
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/d0300246 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d0300246 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d0300246 Branch: refs/heads/develop Commit: d03002461c9cc46bd863407a2ce47de577650693 Parents: a895abe Author: scnakandala <[email protected]> Authored: Tue Dec 13 17:27:21 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Dec 13 17:27:21 2016 -0500 ---------------------------------------------------------------------- .../lib/airavata/experimentModel_types.cpp~ | 3339 ------------------ modules/xbaya/src/.DS_Store | Bin 6148 -> 0 bytes modules/xbaya/src/main/.DS_Store | Bin 6148 -> 0 bytes modules/xbaya/src/main/java/.DS_Store | Bin 6148 -> 0 bytes modules/xbaya/src/main/java/org/.DS_Store | Bin 6148 -> 0 bytes .../xbaya/src/main/java/org/airavata/.DS_Store | Bin 6148 -> 0 bytes .../src/main/java/org/airavata/xbaya/.DS_Store | Bin 6148 -> 0 bytes 7 files changed, 3339 deletions(-) ----------------------------------------------------------------------
