| 
						
					 | 
					
						
						
						
						
							
						
						
							7df6bfedc2
							
						
					 | 
					
						
						
							
							sync commits for pull request
						
						
						
						
						
						
					 | 
					
						2023-04-18 11:17:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4def0d6e40
							
						
					 | 
					
						
						
							
							ennene
						
						
						
						
						
						
					 | 
					
						2023-04-18 11:02:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9ec741c76
							
						
					 | 
					
						
						
							
							brrrrr
						
						
						
						
						
						
					 | 
					
						2023-04-18 11:02:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							39ca87e5d1
							
						
					 | 
					
						
						
							
							Merge pull request 'new conflict' (#2) from testing2/repo-forking-test:feat2 into master
						
						
						
						
						
						
						
						Reviewed-on: dymik739/repo-forking-test#2 
						
						
					 | 
					
						2023-04-18 10:57:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3965017c8a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into feat2
						
						
						
						
						
						
					 | 
					
						2023-04-18 10:56:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95dc480e67
							
						
					 | 
					
						
						
							
							usual commit
						
						
						
						
						
						
					 | 
					
						2023-04-18 10:53:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54b510cf34
							
						
					 | 
					
						
						
							
							new conflict
						
						
						
						
						
						
					 | 
					
						2023-04-18 10:52:39 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							271715951d
							
						
					 | 
					
						
						
							
							resolved merging conflict
						
						
						
						
						
						
					 | 
					
						2023-04-18 09:14:23 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							058944edc7
							
						
					 | 
					
						
						
							
							new feature 1
						
						
						
						
						
						
					 | 
					
						2023-04-18 08:57:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95476bab77
							
						
					 | 
					
						
						
							
							add some code
						
						
						
						
						
						
					 | 
					
						2023-04-18 08:44:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c49cf09cd
							
						
					 | 
					
						
						
							
							new function
						
						
						
						
						
						
					 | 
					
						2023-04-18 08:35:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a2359a8ec
							
						
					 | 
					
						
						
							
							initial commit
						
						
						
						
						
						
					 | 
					
						2023-04-18 07:55:32 +03:00 | 
					
					
						
						
							
							
							
						
					 |