Resolve conflicts for version 2.3.0 release

.formatter.exs

@@ -0,0 +1,7 @@
+[
+  # files to format
+  inputs: ["mix.exs", "{config,lib,test,priv}/**/*.{ex,exs}"],
+  locals_without_parens: [config: 0],
+  line_length: 120,
+  rename_deprecated_at: "1.6.1"
+]

README.md

@@ -11,7 +11,7 @@ along with `:ex_aws` and your preferred JSON codec / http client
 def deps do
   [
     {:ex_aws, "~> 2.0"},
-    {:ex_aws_dynamo, "~> 2.2"},
+    {:ex_aws_dynamo, "~> 2.3"},
     {:poison, "~> 3.0"},
     {:hackney, "~> 1.9"},
   ]
@@ -49,22 +49,35 @@ The tests in `test/lib/dynamo/integration_test.exs` will attempt to run against
 ```elixir
 use Mix.Config
 
-config :ex_aws, :dynamodb,
-  scheme: "http://",
-  host: "localhost",
-  port: CHOOSE_YOUR_TEST_PORT,
-  region: "us-east-1"
-
 config :ex_aws,
   debug_requests: true,
   access_key_id: "abcd",
   secret_access_key: "1234",
   region: "us-east-1"
+
+config :ex_aws, :dynamodb,
+  scheme: "http://",
+  host: "localhost",
+  port: CHOOSE_YOUR_TEST_PORT,
+  region: "us-east-1"
 ```
 
 Before setting the `port`, be aware that `integration_test.exs` will create and delete tables with the names `"TestUsers", Test.User, "TestSeveralUsers", TestFoo, "test_books", "TestUsersWithRange"` - be careful when setting the port, as these operations may interfere with your current tables if they share any of those names.
 
 If you do not have a running local instance of DynamoDB and/or you don't provide a `config/test.exs` file, the integration tests will hang for a few seconds before returning `invalid` - this will not interfere with the successful execution of other tests.
+=======
+
+config :ex_aws, :dynamodb,
+  scheme: "http://",
+  host: "localhost",
+  port: CHOOSE_YOUR_TEST_PORT,
+  region: "us-east-1"
+```
+
+Before setting the `port`, be aware that `integration_test.exs` will create and delete tables with the names `"TestUsers", "Test.User", "TestSeveralUsers", "TestFoo", "test_books", "TestUsersWithRange", "TestTransactions", "TestTransactions2"` - be careful when setting the port, as these operations may affect your current tables if they share any of those names.
+
+If you do not have a running local instance of DynamoDB and/or you don't provide a `config/test.exs` file, the integration tests will hang for a few seconds before returning `invalid` - this will not interfere with the successful execution of the other tests.
+>>>>>>> transactions
 
 ## License
 

config/config.exs

@@ -1,3 +1,3 @@
 use Mix.Config
 
-import_config "#{Mix.env}.exs"
+import_config "#{Mix.env()}.exs"

config/dev.exs

@@ -1,5 +1,11 @@
 use Mix.Config
 
+config :ex_aws,
+  debug_requests: true,
+  access_key_id: "abcd",
+  secret_access_key: "1234",
+  region: "us-east-1"
+
 config :ex_aws, :dynamodb,
   scheme: "http://",
   host: "localhost",

config/test.exs.example

@@ -0,0 +1,15 @@
+# Sample test.exs configuration file. See README for more info.
+
+use Mix.Config
+
+config :ex_aws,
+  debug_requests: true,
+  access_key_id: "abcd",
+  secret_access_key: "1234",
+  region: "us-east-1"
+
+config :ex_aws, :dynamodb,
+  scheme: "http://",
+  host: "localhost",
+  port: CHOOSE_YOUR_TEST_PORT,
+  region: "us-east-1"

config/test_options.exs

@@ -1,7 +1,5 @@
 use Mix.Config
-require Logger
 
-config :ex_aws, :dynamodb,
-  decode_sets: true
+config :ex_aws, :dynamodb, decode_sets: true
 
 import_config "test.exs"