Merge branch 'main' into main

FreeRTOS · Sep 5, 2023 · e0617e3 · e0617e3
2 parents 398ea06 + 3e68c36
commit e0617e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/clang-formatting/filesWithCRLFEndings/fileWithCRLFEnding.h b/clang-formatting/filesWithCRLFEndings/fileWithCRLFEnding.h
@@ -43,5 +43,5 @@
 #if ( PCLKB_FREQUENCY > 50000000L )  
     #error "PCLKB_FREQUENCY Error: Please enter a valid divider value"
 #endif
-   
-#endif
+
+#endif
diff --git a/clang-formatting/filesWithCRLFEndings/fileWithCRLFEndingWithDifferentExtension.txt b/clang-formatting/filesWithCRLFEndings/fileWithCRLFEndingWithDifferentExtension.txt
@@ -43,5 +43,3 @@
 #if ( PCLKB_FREQUENCY > 50000000L )  
     #error "PCLKB_FREQUENCY Error: Please enter a valid divider value"
 #endif
-
-#endif
diff --git a/clang-formatting/filesWithCRLFEndings/testWithCRLFEnding.c b/clang-formatting/filesWithCRLFEndings/testWithCRLFEnding.c
@@ -1,4 +1,3 @@
-/*
 /*
  * FreeRTOS V202212.00
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
@@ -78,4 +77,3 @@ unsigned long ulReceivedValue;
 	}
 }
 /*-----------------------------------------------------------*/
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,5 @@ @@
     #if ( PCLKB_FREQUENCY > 50000000L )
         #error "PCLKB_FREQUENCY Error: Please enter a valid divider value"
     #endif
-    #endif
+    #endif