1.1 --- a/src/work/marci_graph_concept.txt	Tue Jan 27 21:23:33 2004 +0000
     1.2 +++ b/src/work/marci_graph_concept.txt	Tue Jan 27 21:36:17 2004 +0000
     1.3 @@ -26,13 +26,8 @@
     1.4  class node_iterator;      
     1.5  trivialis node iterator, csak cimezni lehet vele, pl property vectort
     1.6  
     1.7 -<<<<<<< marci_graph_concept.txt
     1.8 -class each_node_iterator
     1.9 +class each_node_iterator;
    1.10  node iterator a graf pontjainak bejarasara, node_iterator-ra konvertalhato
    1.11 -=======
    1.12 -class each_node_iterator;
    1.13 -node iterator a graf pontjainak bejarasara, node_iterator-a konvertalhato
    1.14 ->>>>>>> 1.3
    1.15  
    1.16  class edge_iterator;
    1.17  trivialis edge iterator, csak cimezni lehet vele, pl property vectort
    1.18 @@ -40,30 +35,15 @@
    1.19  class each_edge_iterator;
    1.20  edge iterator a graf osszes elenek bejarasara
    1.21  
    1.22 -<<<<<<< marci_graph_concept.txt
    1.23 -class out_edge_iterator
    1.24 +class out_edge_iterator;
    1.25  edge iterator 1 pont ki eleinek bejarasara, edge_iterator-ra konvertalhato
    1.26 -=======
    1.27 -class out_edge_iterator;
    1.28 -edge iterator 1 pont ki eleinek bejarasara, edge_iterator-a konvertalhato
    1.29 ->>>>>>> 1.3
    1.30  
    1.31 -<<<<<<< marci_graph_concept.txt
    1.32 -class in_edge_iterator
    1.33 +class in_edge_iterator;
    1.34  edge iterator 1 pont be eleinek bejarasara, edge_iterator-ra konvertalhato
    1.35 -=======
    1.36 -class in_edge_iterator;
    1.37 -edge iterator 1 pont be eleinek bejarasara, edge_iterator-a konvertalhato
    1.38 ->>>>>>> 1.3
    1.39        
    1.40 -<<<<<<< marci_graph_concept.txt
    1.41 -class sym_edge_iterator
    1.42 +class sym_edge_iterator;
    1.43  edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-ra
    1.44  konvertalhato 
    1.45 -=======
    1.46 -class sym_edge_iterator;
    1.47 -edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-a konvertalhato
    1.48 ->>>>>>> 1.3
    1.49  
    1.50  default constructor:
    1.51  
    1.52 @@ -234,4 +214,4 @@
    1.53  at a propertyket az algoritmusoknak, algoritmus-objektumoknak. 
    1.54  Errol majd kesobb.
    1.55  
    1.56 -marci@cs.elte.hu
    1.57 \ No newline at end of file
    1.58 +marci@cs.elte.hu