diff options
Diffstat (limited to 'Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java')
| -rw-r--r-- | Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java index 225347a..74ef8fc 100644 --- a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java +++ b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java @@ -1,4 +1,5 @@ /* +<<<<<<< HEAD * The MIT License (MIT) * * Copyright (c) 2015 Camil Staps <info@camilstaps.nl> @@ -20,6 +21,9 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. +======= + * Copyright (c) 2015 Camil Staps +>>>>>>> 85751141b5705dba503b507ab34cc4ee734a9e6a */ package com.camilstaps.mandelbrot; |