| commit | c246a98f5e5ff038efbeb9a3947386cb6170011d | [log] [tgz] |
|---|---|---|
| author | Alex Vakulenko <avakulenko@google.com> | Mon Aug 31 09:25:32 2015 -0700 |
| committer | Alex Vakulenko <avakulenko@google.com> | Mon Aug 31 09:25:32 2015 -0700 |
| tree | fc89e9b9f78a35ee220636aad22c22f661c5912a | |
| parent | 2924832c6f93e2ac5e7b4195bdc2b2243f7b6804 [diff] |
Remove unnecessary file publisher.cc.rej was a merge conflict resolution file created by git which accidentally got committed. Removing... Change-Id: I090b0ef8f596d009bf61488266f9b3a8e7c3d6d0