| commit | 1b30f6399d091ae9648d2fe9019ba360396d63ca | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:03:25 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:03:25 2013 -0800 |
| tree | effbf9eb8f4b7fc82728f2092e0e24557c415d20 | |
| parent | f6600f6cffa50633e67770637e0980d8c16d23e7 [diff] |
fix conflict in comment
diff --git a/pregelix/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java b/pregelix/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java index b2ac4a5..a42b411 100644 --- a/pregelix/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java +++ b/pregelix/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java
@@ -610,10 +610,6 @@ * Terminate the current partition where the current vertex stays in. * This will immediately take effect and the upcoming vertice in the * same partition cannot be processed. - * <<<<<<< HEAD - * - ======= - * >>>>>>> master */ protected final void terminatePartition() { voteToHalt();