chore: clean conflict markers in browser.go

1 file · +0 -3

M internal/app/browser/browser.go +0 -3


@@ -236,9 +236,6 @@ func (app *BrowserApp) Run() {
236	236		// Register custom scheme resolver for "dumb://" URIs (will be applied after WebView creation)
237	237		webkit.RegisterURIScheme("dumb", app.schemeHandler.Handle)
238	238
239		-	<<<<<<< HEAD
240		-	=======
241		-	>>>>>>> 78667ac (refactor(browser): defer content blocking initialization to main loop)
242	239		// Create and setup WebView (this also creates TabManager which creates more WebViews)
243	240		if err := app.createWebView(); err != nil {
244	241		logging.Warn(fmt.Sprintf("Warning: failed to create WebView: %v", err))


@@ -236,9 +236,6 @@ func (app *BrowserApp) Run() {
236		// Register custom scheme resolver for "dumb://" URIs (will be applied after WebView creation)	236	// Register custom scheme resolver for "dumb://" URIs (will be applied after WebView creation)
237		webkit.RegisterURIScheme("dumb", app.schemeHandler.Handle)	237	webkit.RegisterURIScheme("dumb", app.schemeHandler.Handle)
238			238
239	-	<<<<<<< HEAD
240	-	=======
241	-	>>>>>>> 78667ac (refactor(browser): defer content blocking initialization to main loop)
242		// Create and setup WebView (this also creates TabManager which creates more WebViews)	239	// Create and setup WebView (this also creates TabManager which creates more WebViews)
243		if err := app.createWebView(); err != nil {	240	if err := app.createWebView(); err != nil {
244		logging.Warn(fmt.Sprintf("Warning: failed to create WebView: %v", err))	241	logging.Warn(fmt.Sprintf("Warning: failed to create WebView: %v", err))