update travis

twilio · Jul 29, 2021 · 7206731 · 7206731
1 parent 7567f41
commit 7206731
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -4,7 +4,11 @@ sonar.organization=twilio
 
 sonar.sources=.
 # Exclude any auto-generated source code
+<<<<<<< HEAD
 sonar.exclusions=rest/**/*
+=======
+sonar.exclusions=twilio/rest/**/*
+>>>>>>> 076dd446 (update travis)
 sonar.tests=.
 sonar.test.inclusions=rest/*_test.go