# HG changeset patch
# User klao
# Date 1075239377 0
# Node ID ffaa9448964c098394d290e79243471eab89703e
# Parent  28b0d751d29ff57e0ab2cc42eceb2cae43fc9ce1
Jacint conflict-janak kijavitasa

diff -r 28b0d751d29f -r ffaa9448964c src/work/marci_graph_concept.txt
--- a/src/work/marci_graph_concept.txt	Tue Jan 27 21:23:33 2004 +0000
+++ b/src/work/marci_graph_concept.txt	Tue Jan 27 21:36:17 2004 +0000
@@ -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
+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
 
 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
+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
 
-<<<<<<< marci_graph_concept.txt
-class in_edge_iterator
+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
       
-<<<<<<< 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@cs.elte.hu
\ No newline at end of file
+marci@cs.elte.hu