Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
decenzo committed Dec 22, 2021
2 parents 97227cd + 3b89f4f commit e09c71c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion examples/tv-casting-app/linux/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
chip_build_libshell = true

chip_enable_rotating_device_id = true

0 comments on commit e09c71c

Please sign in to comment.