Fix git merge conflicts from Helix and Cache work
This commit is contained in:
		
				
					committed by
					
						
						Nick Cameron
					
				
			
			
				
	
			
			
			
						parent
						
							10c446151b
						
					
				
				
					commit
					617dcfee34
				
			@ -49,7 +49,7 @@ springSketch = startSketchOn('YZ')
 | 
			
		||||
// Create a helix around an edge.
 | 
			
		||||
helper001 = startSketchOn('XZ')
 | 
			
		||||
  |> startProfileAt([0, 0], %)
 | 
			
		||||
  |> line([0, 10], %, $edge001)
 | 
			
		||||
  |> line(end = [0, 10], tag = $edge001)
 | 
			
		||||
 | 
			
		||||
helixPath = helix({
 | 
			
		||||
  angleStart = 0,
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user