stephens2424

diff --git a/config/dev-server-config.json b/config/dev-server-config.json
index d5dbaf1..6c1c8ef 100644
--- a/config/dev-server-config.json
+++ b/config/dev-server-config.json
@@ -61,10 +61,16 @@
 				"sourceRoot": ["_env", "${CAMLI_DEV_CAMLI_ROOT}", ""],
 				"cache": "/cache/",
 				"scaledImage": {
+<<<<<<< HEAD
 					"type": "leveldb",

stephens2424

package mail

import (
	"encoding/json"
	"fmt"
	"io"
	"net/mail"
	"os/exec"
	"strings"
)

stephens2424

Keybase proof

I hereby claim:

• I am stephens2424 on github.
• I am stephensearles (https://keybase.io/stephensearles) on keybase.
• I have a public key whose fingerprint is A6C3 9A08 A129 9500 F39D 39C6 E78C C120 8A9F 3618

To claim this, I am signing this object:

stephens2424

I need to get back to that one branch. Let me check I'm not going to cause problems by leaving where I am.

$ git st (git status -sb)
## master

Ok, I'm still on master with a clean tree. Now what was the exact branch name of where I was going?

stephens2424

Dear Lawmaker,

I demand that you oppose both the Stop Online Piracy Act (SOPA, H.R.3261) and the PROTECT IP Act (PIPA, S.968). These bills unduly hamper citizens' freedom in the name of an industry that would rather see a legal stranglehold on free speech than shift their business model along with modern times.

These bills would prohibit forms of technology instrumental to modern protest and the free exchange of ideas, corroding the very basis of the Internet itself. As the Electronic Frontier Foundation smartly points out, many legitimate technologies could easily be ruled illegal under these laws—programs like SSH, a vital tool to virtually all systems administrators. Putting the DNS system at risk under these bills will undermine the security of the Internet and disallowing proxy servers would make impossible the kind of technological coordination seen between US citizens and Arab protesters under oppressive regimes.

The movie industry has always tolerated some degree of piracy. Even today, I see people