After pull conflict resolution.
This commit is contained in:
		
							parent
							
								
									9992a12b38
								
							
						
					
					
						commit
						de1f778a0e
					
				| @ -2,8 +2,7 @@ | |||||||
| \label{classcore_1_1Subscription}\index{core::Subscription@{core::Subscription}} | \label{classcore_1_1Subscription}\index{core::Subscription@{core::Subscription}} | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| Collaboration diagram for core\+::Subscription\+: | Collaboration diagram for core\+::Subscription\+:\nopagebreak | ||||||
| \nopagebreak |  | ||||||
| \begin{figure}[H] | \begin{figure}[H] | ||||||
| \begin{center} | \begin{center} | ||||||
| \leavevmode | \leavevmode | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Brad Arant
						Brad Arant