From b0b44b76c50705e61448fcbf4407cd6d77328d62 Mon Sep 17 00:00:00 2001
From: aleandro <a.pagani.it@gmail.com>
Date: Fri, 12 Jun 2026 20:53:36 +0200
Subject: [PATCH] Remove conflicts

---
 ...FConflict a.pagani.it 2026-01-22-12-21-01) | Bin 18352 -> 0 bytes
 ...onflict a.pagani.it 2026-01-22-12-21-01).c | 110 ------------------
 2 files changed, 110 deletions(-)
 delete mode 100644 main (SFConflict a.pagani.it 2026-01-22-12-21-01)
 delete mode 100644 main (SFConflict a.pagani.it 2026-01-22-12-21-01).c

diff --git a/main (SFConflict a.pagani.it 2026-01-22-12-21-01) b/main (SFConflict a.pagani.it 2026-01-22-12-21-01)
deleted file mode 100644
index e5286c9674c2c440f57f3103abca8bc989a0d70b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18352
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
K<uGut?0*5z3?n)K

diff --git a/main (SFConflict a.pagani.it 2026-01-22-12-21-01).c b/main (SFConflict a.pagani.it 2026-01-22-12-21-01).c
deleted file mode 100644
index 3b410d4..0000000
--- a/main (SFConflict a.pagani.it 2026-01-22-12-21-01).c	
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <stdio.h>
-
-#define W 0
-#define Y 1
-#define O 2
-#define R 3
-#define B 4
-#define G 5
-
-
-
-typedef struct Cube {
-    int front[3][3];
-    int back[3][3];
-    int top[3][3];
-    int bottom[3][3];
-    int right[3][3];
-    int left[3][3];
-} Cube;
-
-
-void initialize(Cube *cube) {
-
-    for (int i=0; i<3; i++) {
-        for (int j=0; j<3; j++) {
-            cube->front[i][j] = W;
-            cube->back[i][j] = Y;
-            cube->top[i][j] = O;
-            cube->bottom[i][j] = R;
-            cube->right[i][j] = B;
-            cube->left[i][j] = G;
-        }
-    }
-} 
-
-void print(Cube *cube) {
-    char colors[] = {'W', 'Y', 'O', 'R', 'B', 'G'};
-
-    printf("          %c, %c, %c, \n", colors[cube->back[0][0]], colors[cube->back[0][1]], colors[cube->back[0][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->back[1][0]], colors[cube->back[1][1]], colors[cube->back[1][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->back[2][0]], colors[cube->back[2][1]], colors[cube->back[2][2]]);
-
-    printf("\n");
-    printf("          %c, %c, %c, \n", colors[cube->top[0][0]], colors[cube->top[0][1]], colors[cube->top[0][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->top[1][0]], colors[cube->top[1][1]], colors[cube->top[1][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->top[2][0]], colors[cube->top[2][1]], colors[cube->top[2][2]]);
-
-    printf("\n");
-    printf("%c, %c, %c,  ", colors[cube->left[0][0]], colors[cube->left[0][1]], colors[cube->left[0][2]]);
-    printf("%c, %c, %c,  ", colors[cube->front[0][0]], colors[cube->front[0][1]], colors[cube->front[0][2]]);
-    printf("%c, %c, %c,  ", colors[cube->right[0][0]], colors[cube->right[0][1]], colors[cube->right[0][2]]);
-    
-    printf("\n");
-    printf("%c, %c, %c,  ", colors[cube->left[1][0]], colors[cube->left[1][1]], colors[cube->left[1][2]]);
-    printf("%c, %c, %c,  ", colors[cube->front[1][0]], colors[cube->front[1][1]], colors[cube->front[1][2]]);
-    printf("%c, %c, %c,  ", colors[cube->right[1][0]], colors[cube->right[1][1]], colors[cube->right[1][2]]);
-
-    printf("\n");
-    printf("%c, %c, %c,  ", colors[cube->left[2][0]], colors[cube->left[2][1]], colors[cube->left[2][2]]);
-    printf("%c, %c, %c,  ", colors[cube->front[2][0]], colors[cube->front[2][1]], colors[cube->front[2][2]]);
-    printf("%c, %c, %c,  ", colors[cube->right[2][0]], colors[cube->right[2][1]], colors[cube->right[2][2]]);
-
-    printf("\n\n");
-    printf("          %c, %c, %c, \n", colors[cube->bottom[0][0]], colors[cube->bottom[0][1]], colors[cube->bottom[0][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->bottom[1][0]], colors[cube->bottom[1][1]], colors[cube->bottom[1][2]]);
-    printf("          %c, %c, %c, \n", colors[cube->bottom[2][0]], colors[cube->bottom[2][1]], colors[cube->bottom[2][2]]);
-
-    printf("----------------------------\n");
-}
-
-void rotate_face(int mat[3][3]) {
-    int temp[3][3];
-    
-    for(int i=0;i<3;i++){
-        for(int j=0;j<3;j++){
-            temp[j][3-1-i] = mat[i][j];
-        }
-    }
-    
-    for(int i=0;i<3;i++) {
-        for(int j=0;j<3;j++) {
-            mat[i][j] = temp[i][j];
-        }
-    }
-}
-
-void rotate_edge_corner (Cube *cube, char side[10]) {
-    // TODO
-    // Note: unify rotate_edge_corner with rotate_face
-}
-
-void main (){
-
-    Cube cube;
-    initialize(&cube);
-
-    cube.back[0][1]=3;
-    cube.back[2][2]=4;
-
-    print(&cube);
-
-    rotate_90(cube.back);
-    
-    print(&cube);
-
-    rotate_90(cube.back);
-    
-    print(&cube);
-
-}
\ No newline at end of file