Some conflict, probably due to line ending at LocalGridServiceConnector.cs. Just commit the difference to move on.
							parent
							
								
									1837778cf9
								
							
						
					
					
						commit
						e66668ad7e
					
				|  | @ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
|             return m_GridService.LookupQuark(locX, locY, actorType); | ||||
|         } | ||||
|         public bool CleanUpEndpoint(string syncServerID) | ||||
|         { | ||||
|         { | ||||
|             return m_GridService.CleanUpEndpoint(syncServerID); | ||||
|         } | ||||
|         #endregion SYNC SERVER | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Huaiyu (Kitty) Liu
						Huaiyu (Kitty) Liu