Fix gitignore merge

1 files changed, 15 insertions, 0 deletions

diff --git a/carre.cpp b/carre.cpp
new file mode 100644
index 0000000..627eb91
--- /dev/null
+++ b/carre.cpp
@@ -0,0 +1,15 @@
+#include "carre.h"
+
+Carre::Carre(int x, int y, int cote) : Rectangle(x, y, cote, cote) {
+};
+
+Carre::~Carre() {
+};
+
+void Carre::afficher(ostream &s) {
+    s << "Carre(x=" << getAncrage().x
+      << ", y=" << getAncrage().y
+      << ", c=" << getLargeur()
+      << ", a=" << aire()
+      << ")\n";
+};