Skip to content

Commit

Permalink
Merge branch 'develop' into future
Browse files Browse the repository at this point in the history
  • Loading branch information
neilalexander committed Sep 3, 2023
2 parents 6ab0639 + 12a3a8c commit 8f3ab1d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/tun/tun_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !mobile
// +build !mobile
//go:build linux || android
// +build linux android

package tun

Expand Down
4 changes: 2 additions & 2 deletions src/tun/tun_other.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !linux && !darwin && !windows && !openbsd && !freebsd && !mobile
// +build !linux,!darwin,!windows,!openbsd,!freebsd,!mobile
//go:build !linux && !darwin && !ios && !android && !windows && !openbsd && !freebsd && !mobile
// +build !linux,!darwin,!ios,!android,!windows,!openbsd,!freebsd,!mobile

package tun

Expand Down

0 comments on commit 8f3ab1d

Please sign in to comment.