From b3284cc45350795abc54566c670265d44fc4844d Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 8 Jan 2020 17:20:40 -0500
Subject: [PATCH] allow merge

---
 nbactions.xml | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/nbactions.xml b/nbactions.xml
index 79ae2b9..00290ed 100644
--- a/nbactions.xml
+++ b/nbactions.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>build</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>compile</goal>
-                <goal>assembly:single</goal>
-            </goals>
-        </action>
-        <action>
-            <actionName>rebuild</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>clean</goal>
-                <goal>compile</goal>
-                <goal>assembly:single</goal>
-            </goals>
-        </action>
-    </actions>
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+    <action>
+        <actionName>build</actionName>
+        <packagings>
+            <packaging>*</packaging>
+        </packagings>
+        <goals>
+            <goal>compile</goal>
+            <goal>assembly:single</goal>
+        </goals>
+    </action>
+    <action>
+        <actionName>rebuild</actionName>
+        <packagings>
+            <packaging>*</packaging>
+        </packagings>
+        <goals>
+            <goal>clean</goal>
+            <goal>compile</goal>
+            <goal>assembly:single</goal>
+        </goals>
+    </action>
+</actions>