[Lemon-commits] [lemon_svn] klao: r54 - hugo/trunk/src/work

[Lemon SVN]

Author: klao
Date: Tue Jan 27 22:36:17 2004
New Revision: 54

Modified:
   hugo/trunk/src/work/marci_graph_concept.txt

Log:
Jacint conflict-janak kijavitasa


Modified: hugo/trunk/src/work/marci_graph_concept.txt
==============================================================================
--- hugo/trunk/src/work/marci_graph_concept.txt	(original)
+++ hugo/trunk/src/work/marci_graph_concept.txt	Tue Jan 27 22:36:17 2004
@@ -26,13 +26,8 @@
 class node_iterator;      
 trivialis node iterator, csak cimezni lehet vele, pl property vectort
 
-<<<<<<< marci_graph_concept.txt
-class each_node_iterator
-node iterator a graf pontjainak bejarasara, node_iterator-ra konvertalhato
-=======
 class each_node_iterator;
-node iterator a graf pontjainak bejarasara, node_iterator-a konvertalhato
->>>>>>> 1.3
+node iterator a graf pontjainak bejarasara, node_iterator-ra konvertalhato
 
 class edge_iterator;
 trivialis edge iterator, csak cimezni lehet vele, pl property vectort
@@ -40,30 +35,15 @@
 class each_edge_iterator;
 edge iterator a graf osszes elenek bejarasara
 
-<<<<<<< marci_graph_concept.txt
-class out_edge_iterator
-edge iterator 1 pont ki eleinek bejarasara, edge_iterator-ra konvertalhato
-=======
 class out_edge_iterator;
-edge iterator 1 pont ki eleinek bejarasara, edge_iterator-a konvertalhato
->>>>>>> 1.3
+edge iterator 1 pont ki eleinek bejarasara, edge_iterator-ra konvertalhato
 
-<<<<<<< marci_graph_concept.txt
-class in_edge_iterator
-edge iterator 1 pont be eleinek bejarasara, edge_iterator-ra konvertalhato
-=======
 class in_edge_iterator;
-edge iterator 1 pont be eleinek bejarasara, edge_iterator-a konvertalhato
->>>>>>> 1.3
+edge iterator 1 pont be eleinek bejarasara, edge_iterator-ra konvertalhato
       
-<<<<<<< marci_graph_concept.txt
-class sym_edge_iterator
+class sym_edge_iterator;
 edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-ra
 konvertalhato 
-=======
-class sym_edge_iterator;
-edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-a konvertalhato
->>>>>>> 1.3
 
 default constructor:
 
@@ -234,4 +214,4 @@
 at a propertyket az algoritmusoknak, algoritmus-objektumoknak. 
 Errol majd kesobb.
 
-marci at cs.elte.hu
\ No newline at end of file
+marci at cs.elte.hu