mirror of
				https://github.com/lightpanda-io/browser.git
				synced 2025-10-29 15:13:28 +00:00 
			
		
		
		
	fix merge conflict
This commit is contained in:
		| @@ -701,8 +701,7 @@ pub const Page = struct { | ||||
|                 // so we load a blank document to navigate away from any prior page. | ||||
|                 self.mode = .{ .parsed = {} }; | ||||
|  | ||||
|                 var fbs = std.io.fixedBufferStream(""); | ||||
|                 const html_doc = try parser.documentHTMLParse(fbs.reader(), "utf-8"); | ||||
|                 const html_doc = try parser.documentHTMLParseFromStr(""); | ||||
|                 try self.setDocument(html_doc); | ||||
|  | ||||
|                 self.documentIsComplete(); | ||||
| @@ -768,10 +767,6 @@ pub const Page = struct { | ||||
|                     self.documentIsComplete(); | ||||
|                 } | ||||
|             }, | ||||
|             .pre => { | ||||
|                 // we didn't get any data. | ||||
|                 self.documentIsComplete(); | ||||
|             }, | ||||
|             else => { | ||||
|                 log.err(.app, "unreachable mode", .{ .mode = self.mode }); | ||||
|                 unreachable; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 sjorsdonkers
					sjorsdonkers