Fix gitignore merge

1 files changed, 13 insertions, 0 deletions

diff --git a/carre.h b/carre.h
new file mode 100644
index 0000000..bf1cc84
--- /dev/null
+++ b/carre.h
@@ -0,0 +1,13 @@
+#ifndef __CARRE_H__
+#define __CARRE_H__
+
+#include "rectangle.h"
+
+class Carre : public Rectangle {
+public:
+    Carre(int x=0, int y=0, int cote=1);
+    ~Carre();
+    void afficher(ostream &s);
+};
+
+#endif